From 31055f43e7d22f480e7ef36e6637a28f419d6612 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 16 Oct 2020 10:32:56 +0800 Subject: [PATCH] =?UTF-8?q?fix=20wx=5Fcoupon=5Fchannel=E5=88=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxOrderGroupServiceImpl.java | 2 +- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 280ffe70b..faf42d675 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -303,7 +303,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { if (orderTemp.getOrderGroupId().equals(0L)) { return new ResultData(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); } - WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(orderTemp.getCouponChannelId()); + WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(orderTemp.getCouponChannelId(),orderTemp.getTenantId()); if (wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF); } 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 179f88166..c8b106552 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1138,7 +1138,7 @@ public class WxOrderServiceImpl implements WxOrderService { cardInfo.setSupportTransfer(coupon.getSupportTransfer()); //检查卡是否下架,如果是,不可转赠 - WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(order.getCouponChannelId()); + WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(order.getCouponChannelId(),order.getTenantId()); if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); } @@ -1222,7 +1222,7 @@ public class WxOrderServiceImpl implements WxOrderService { cardInfo.setSupportTransfer(coupon.getSupportTransfer()); //检查卡是否下架,如果是,不可转赠 - WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(order.getCouponChannelId()); + WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(order.getCouponChannelId(),order.getTenantId()); if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); } @@ -1540,7 +1540,7 @@ public class WxOrderServiceImpl implements WxOrderService { creditHistory.updateTenantInfo(wxMerchant); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); if (updateOrder.getCouponChannelId() != null) { - WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId()); + WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId()); creditHistory.setCouponId(wxCouponChannel.getCouponId()); } creditHistory.setBusinessId(wxMerchant.getBusinessId());