From c05490b51952a280364bb5b320fd58e0946eb73d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 23 Sep 2021 12:41:36 +0800 Subject: [PATCH] fix order bug --- .../controller/market/WxOrderController.java | 4 +++- .../controller/WxCouponPasswordController.java | 3 ++- .../iformall/service/impl/WxOrderServiceImpl.java | 13 +++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 4a365d672..6febe68fb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -25,6 +25,8 @@ import com.iformall.service.WxCUserService; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; import com.iformall.service.WxOrderService; +import com.iformall.service.order.OrderFactory; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -62,7 +64,7 @@ public class WxOrderController extends BaseController { @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; - + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index c4a304fff..73ed43c9f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.service.*; +import com.iformall.service.order.OrderFactory; import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,7 +37,7 @@ public class WxCouponPasswordController extends BaseController { @Autowired private WxCUserBasicInfoService userService; - + @ApiOperation(value = "根据卡密领卡", notes = "{\"password\":\"String\",\"formId\":\"String\"}") @PostMapping("getCouponOrderByPassword") public ResultData getCouponOrderByPassword(@RequestBody Map params) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 5f3b2d856..2c6282c34 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2089,11 +2089,16 @@ public class WxOrderServiceImpl implements WxOrderService { record.setPayment(0); record.setFormId(formId); record.setOrderGroupId(0L); - record.setComposeOrderId(composeOrder.getMainOrderId()); - if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { - record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); + if (null != composeOrder) { + record.setComposeOrderId(composeOrder.getMainOrderId()); + if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { + record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); + }else { + record.setComposeOrderType(composeOrder.getComposeOrderType()); + } }else { - record.setComposeOrderType(composeOrder.getComposeOrderType()); + record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); + record.setComposeOrderId(0L); } record.setCouponNumber(couponNumber); try {