--no commit message

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(form.getCode(), form.getSource(), form.getPayType()));
+		Integer orderId = fgOrderService.createOrder(form);
+		Order o = fgOrderService.notNull(orderId);
+		return CallBack.success(fgOrderService.payWap(o, 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(String code, String source, String payType);
+	PayInfoVo payWap(Order order, String source, String payType);
 	
 	/**
 	 * 接收三方调用----拿到支付回调修改订单状态

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

@@ -203,11 +203,7 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
 	}
 	
 	@Override
-	public PayInfoVo payWap(String code, String source, String payType) {
-		Order order = notNull(record -> {
-			record.setCode(code);
-			record.setCreater(fgRedisManage.getMember().getId());
-		});
+	public PayInfoVo payWap(Order order, String source, String payType) {
 		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);