--no commit message

app/order/src/main/java/com/zrqx/order/commons/form/fg/WapOrderForm.java

@@ -8,5 +8,8 @@ public class WapOrderForm extends FgOrderForm{
 	
 	@ApiModelProperty("支付类型 0支付宝  1微信")
     private String payType;
+	
+	@ApiModelProperty("订单号")
+	private String code;
 
 }

app/order/src/main/java/com/zrqx/order/fg/controller/FgOrderController.java

@@ -98,9 +98,9 @@ public class FgOrderController {
 	@ApiOperation("wap生成订单并支付")
 	@PostMapping("/wap/pay/order")
 	public CallBack<PayInfoVo> createOrderAndPay(@RequestBody WapOrderForm form){
-		Integer orderId = fgOrderService.createOrder(form);
-		Order o = fgOrderService.notNull(orderId);
-		return CallBack.success(fgOrderService.payWap(o, form.getSource(), form.getPayType()));
+//		Integer orderId = fgOrderService.createOrder(form);
+//		Order o = fgOrderService.notNull(orderId);
+		return CallBack.success(fgOrderService.payWap(form.getCode(), form.getSource(), form.getPayType()));
 	}
 	
 	

app/order/src/main/java/com/zrqx/order/fg/service/FgOrderService.java

@@ -57,7 +57,7 @@ public interface FgOrderService extends BaseService<Order, Integer>{
 	  * @author lpf
 	  * @date 2020-04-09 10:49
 	  */
-	PayInfoVo payWap(Order o, String source, String payType);
+	PayInfoVo payWap(String code, String source, String payType);
 	
 	/**
 	 * 接收三方调用----拿到支付回调修改订单状态

app/order/src/main/java/com/zrqx/order/fg/service/FgOrderServiceImpl.java

@@ -203,8 +203,11 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
 	}
 	
 	@Override
-	public PayInfoVo payWap(Order order, String source, String payType) {
-		validateOrder(order);
+	public PayInfoVo payWap(String code, String source, String payType) {
+		Order order = notNull(record -> {
+			record.setCode(code);
+			record.setCreater(fgRedisManage.getMember().getId());
+		});
 		CallBack<PayInfoVo> result = fgPayClient.pay(order.getCode(), source, payType);
 		if (PayTypeEnum.BALANCE.getCode().equals(payType)) {
 			OrderTypeInterface orderTypeService = springContext.getEnumsBindBean(OrderTypeEnum.class, order.getOrderType(), OrderTypeInterface.class);

app/third/src/main/java/com/zrqx/third/pay/interfaces/payType/impl/WeChatPayImpl.java

@@ -100,7 +100,7 @@ public class WeChatPayImpl extends PayTypeAdapter{
 			// 计算订单的交易起始时间和结束时间
 			Date start = orderPayVo.getCreateTime();
 			// 结束时间为订单创建时间的一小时后
-			Date end = DateUtils.addDateHour(start, 1);
+			Date end = DateUtils.addDateHour(start, 24);
 			String startStr = DateUtils.dateTimeToStr(start, DateUtils.DATE_TIME_FORMAT_YYYYMMDDHHMISS);
 			String endStr = DateUtils.dateTimeToStr(end, DateUtils.DATE_TIME_FORMAT_YYYYMMDDHHMISS);
 			
@@ -156,7 +156,7 @@ public class WeChatPayImpl extends PayTypeAdapter{
 	            wecartPayReturn.setTimestamp(timestamp);
 			}
 	        logger.info("wwwwwwwwwwwwwwwwwwww订单:" + toPayForm.getOut_trade_no() + "完成获取微信链接wwwwwwwwwwwwwwwwwwww");
-	        return CallBack.success(wecartPayReturn.getCode_url());
+	        return CallBack.success(wecartPayReturn.getMweb_url());
 		} catch (Exception e) {
 			logger.error("wwwwwwwwwwwwwwwwwwww订单:" + toPayForm.getOut_trade_no() + "获取微信链接失败wwwwwwwwwwwwwwwwwwww");
 			logger.error(e.getMessage());

app/third/src/main/resources/application.yml

@@ -62,17 +62,18 @@ pay:
 #   gatewayUrl: https://openapi.alipay.com/gateway.do  # 沙箱  
   wechatpay:
     # 公众账号ID
-    appID: wx3f8cef1535df5dde
+    appID: wxdee4149de87badc3
     # 商户号 
-    mchID: 1503058341
+    mchID: 1280035101
     # API 密钥
-    key: zhongguorenshikaoshitushuwang096
+    key: zhongdianyun12345678901234567890
     # 设备号,pc端填写WEB
     device_info: WEB
     # 终端IP,公司ip为122.14.50.6
     spbill_create_ip: 122.14.50.6
     # 扫码回调地址
-    notify_url: http://122.14.50.6:8096/third/pay_receive/notify_wechat
+    #notify_url: http://122.14.50.6:8096/third/pay_receive/notify_wechat
+    notify_url: http://test16.zhongdianyun.com/index.html#/
   yeepay:
     # 商户编号
     p1_MerId: 10012438171 # 生产