| @@ -231,6 +231,9 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||||
| if (orderTemp == null) { | if (orderTemp == null) { | ||||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | ||||
| } | } | ||||
| if (orderTemp.getOrderGroupId().equals(notOrderGroupId)) { | |||||
| return new ResultData(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); | |||||
| } | |||||
| WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectByPrimaryKey(orderTemp.getCouponChannelId()); | WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectByPrimaryKey(orderTemp.getCouponChannelId()); | ||||
| if (wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { | if (wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { | ||||
| return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF); | return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF); | ||||
| @@ -239,6 +242,9 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||||
| wxOrder.setTenantId(wxOrderGroup.getTenantId()); | wxOrder.setTenantId(wxOrderGroup.getTenantId()); | ||||
| wxOrder.setId(wxOrderGroup.getOrderId()); | wxOrder.setId(wxOrderGroup.getOrderId()); | ||||
| List<Map<String, Object>> couponOrderGroupList = wxOrderGroupMapper.queryOrderGroup(wxOrder); | List<Map<String, Object>> couponOrderGroupList = wxOrderGroupMapper.queryOrderGroup(wxOrder); | ||||
| if (couponOrderGroupList.isEmpty()) { | |||||
| return new ResultData(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); | |||||
| } | |||||
| Map<String, Object> couponOrderGroup = couponOrderGroupList.get(0); | Map<String, Object> couponOrderGroup = couponOrderGroupList.get(0); | ||||
| //商场地址 | //商场地址 | ||||
| WxMall wxMall = new WxMall(); | WxMall wxMall = new WxMall(); | ||||