Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back-end-2393' into release

develop
release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
0ac98e3a10
2 измененных файлов: 3 добавлений и 12 удалений
  1. +3
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
  2. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 3
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java Просмотреть файл

@@ -103,16 +103,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
wxScreenAdService.updateStatusByCouponChannelId(record.getId(),record.getTenantId(),EnumScreenAdStatus.INVALID.getCode());
//下架拼团券
wxOrderService.updateOrderGroupStatusByCouponChannelId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode());
//卡-转赠状态
if (orignal.getType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) {
WxCoupon wxCoupon = new WxCoupon();
wxCoupon.setId(orignal.getCouponId());
wxCoupon.setSupportTransfer(EnumCouponTransfer.NO.getCode());
wxCoupon.setUpdateDate(new Date());
wxCouponService.update(wxCoupon);
//修改卡状态
wxCardInfoMapper.updateTransferStatusByCouponId(orignal.getCouponId());
}
//修改卡状态
wxCardInfoMapper.updateTransferStatusByCouponId(orignal.getCouponId());

}
}
record.setUpdateDate(new Date());


+ 0
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -397,8 +397,6 @@ public class WxCouponServiceImpl implements WxCouponService {
wxScreenAdService.updateStatusByCouponId(record.getId(), record.getTenantId(), EnumScreenAdStatus.INVALID.getCode());
//下架拼团券
wxOrderService.updateOrderGroupStatusByCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode());
//卡-转赠状态
record.setSupportTransfer(EnumCouponTransfer.NO.getCode());
//修改卡状态
wxCardInfoMapper.updateTransferStatusByCouponId(record.getId());



Загрузка…
Отмена
Сохранить