From 1e4d07a9116721be89f766e3fc5498446b7aca36 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 16 Oct 2020 17:14:01 +0800 Subject: [PATCH] =?UTF-8?q?wx=5Forder=5Fgroup=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/mapper/WxOrderGroupMapper.java | 4 ++++ .../service/impl/WxOrderGroupServiceImpl.java | 6 +++--- .../service/impl/WxOrderServiceImpl.java | 2 +- .../resources/mapper/WxOrderGroupMapper.xml | 18 +++++++++++------- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java index e63aa52ea..19ece63a1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderGroupMapper.java @@ -10,11 +10,15 @@ import com.iformall.domain.vo.WxOrderGroupMarketing; import java.util.List; import java.util.Map; +import org.apache.ibatis.annotations.Param; + /** * @author gongbiao */ public interface WxOrderGroupMapper extends CommonMapper { + WxOrderGroup selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + Map queryRemainOne(WxOrderGroup group); List> queryOrderGroup(WxOrder wxOrder); 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 d7081516b..b3c055c79 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -119,7 +119,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { if (!orderGroupId.equals(0L)) { // 非首次拼团 // 参与拼团 - WxOrderGroup wxOrderGroup = wxOrderGroupMapper.selectById(orderGroupId); + WxOrderGroup wxOrderGroup = wxOrderGroupMapper.selectById(orderGroupId,order.getTenantId()); if (null == wxOrderGroup) { //错误,更新状态,定时任务会发起退款,回滚库存 order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); @@ -371,7 +371,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) || o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()); }).count(); - WxOrderGroup group = wxOrderGroupMapper.selectById(wxOrderGroup.getId()); + WxOrderGroup group = wxOrderGroupMapper.selectById(wxOrderGroup.getId(),wxOrderGroup.getTenantId()); Map result = new HashMap<>(2); result.put("attend", count > 0 ? true : false); result.put("status", group.getStatus()); @@ -382,7 +382,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { @Override public void updateGroupStatus(WxOrderGroup wxOrderGroup) { Long id = wxOrderGroup.getId(); - WxOrderGroup group = wxOrderGroupMapper.selectById(id); + WxOrderGroup group = wxOrderGroupMapper.selectById(id,wxOrderGroup.getTenantId()); if (group != null && group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode())) { WxCoupon wxCoupon = wxCouponMapper.selectById(wxOrderGroup.getCouponId(),group.getTenantId()); Integer status = wxCoupon.getStatus(); 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 5ae229060..f5f84f1cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2322,7 +2322,7 @@ public class WxOrderServiceImpl implements WxOrderService { } private void checkOrderGroup(WxCUserBasicInfo user, Long orderGroupId,WxCoupon coupon) { - WxOrderGroup group = wxOrderGroupMapper.selectById(orderGroupId); + WxOrderGroup group = wxOrderGroupMapper.selectById(orderGroupId,coupon.getTenantId()); if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { logger.error("下订单拼团人数已满>>>" + orderGroupId); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 7372be060..f35d900cf 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -52,6 +52,10 @@ order by ${sortColumns} + +