From 485935864b0c519799a64c5886894a2094b0be13 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 12 Mar 2019 20:30:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=8E=BB=E6=8B=BC=E5=9B=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxPayOrderController.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 8ccb6f0a8..c829b11b9 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -5,14 +5,13 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.config.PayProperty; -import com.iformall.domain.po.WxAppinfo; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxOrder; -import com.iformall.domain.po.WxPayOrder; +import com.iformall.domain.po.*; +import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumOrderStatus; import com.iformall.enums.EnumPayStatus; import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; +import com.iformall.service.WxCouponService; import com.iformall.service.WxOrderService; import com.iformall.service.WxPayOrderService; import com.iformall.utils.IPUtil; @@ -44,6 +43,9 @@ public class WxPayOrderController extends BaseController { @Autowired private WxOrderService wxOrderService; + @Autowired + private WxCouponService wxCouponService; + @ApiOperation(value = "发起微信小程序支付订单", notes = "{\"orderId\":\"string\"}") @RequestMapping(value = "/create", method = RequestMethod.POST) public ResultData _create(@RequestBody Map paramMap, HttpServletRequest request) throws Exception { @@ -124,7 +126,8 @@ public class WxPayOrderController extends BaseController { payOrder = wxPayOrderService.getById(payOrderId); if(payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { order = wxOrderService.getById(orderId); - if (!order.getOrderGroupId().equals(0L)) { + WxCoupon coupon = wxCouponService.getById(order.getProductId()); + if (coupon.getType().equals(EnumCouponType.COUPON_GROUP.getCode())) { order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); wxOrderService.saveOrUpdate(order); }