From 830e781aca83d73bfde7f2b25c7ef7b8fa0c8895 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 5 Sep 2019 11:30:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E5=8E=9F=E4=BB=B7=E8=B4=AD=E4=B9=B0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=94=99=E8=AF=AF=E5=8A=A0=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxOrderGroupServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index 1d1605dd8..e2f5cd181 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -231,6 +231,9 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { if (orderTemp == null) { 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()); if (wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF); @@ -239,6 +242,9 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { wxOrder.setTenantId(wxOrderGroup.getTenantId()); wxOrder.setId(wxOrderGroup.getOrderId()); List> couponOrderGroupList = wxOrderGroupMapper.queryOrderGroup(wxOrder); + if (couponOrderGroupList.isEmpty()) { + return new ResultData(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); + } Map couponOrderGroup = couponOrderGroupList.get(0); //ε•†εœΊεœ°ε€ WxMall wxMall = new WxMall();