|
|
|
@@ -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()); |
|
|
|
|