Explorar el Código

fix wx_coupon_channel分表

release_toaliyun_real
xiaohanzi hace 5 años
padre
commit
31055f43e7
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java Ver fichero

@@ -303,7 +303,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
if (orderTemp.getOrderGroupId().equals(0L)) { if (orderTemp.getOrderGroupId().equals(0L)) {
return new ResultData(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); 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())) { 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);
} }


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Ver fichero

@@ -1138,7 +1138,7 @@ public class WxOrderServiceImpl implements WxOrderService {
cardInfo.setSupportTransfer(coupon.getSupportTransfer()); 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())) { if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) {
cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode());
} }
@@ -1222,7 +1222,7 @@ public class WxOrderServiceImpl implements WxOrderService {
cardInfo.setSupportTransfer(coupon.getSupportTransfer()); 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())) { if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) {
cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode()); cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode());
} }
@@ -1540,7 +1540,7 @@ public class WxOrderServiceImpl implements WxOrderService {
creditHistory.updateTenantInfo(wxMerchant); creditHistory.updateTenantInfo(wxMerchant);
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
if (updateOrder.getCouponChannelId() != null) { if (updateOrder.getCouponChannelId() != null) {
WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId());
WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId());
creditHistory.setCouponId(wxCouponChannel.getCouponId()); creditHistory.setCouponId(wxCouponChannel.getCouponId());
} }
creditHistory.setBusinessId(wxMerchant.getBusinessId()); creditHistory.setBusinessId(wxMerchant.getBusinessId());


Cargando…
Cancelar
Guardar