소스 검색

Merge branch 'release_toaliyun_real_20230315' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230315

release_toaliyun_real
xhxu 3 년 전
부모
커밋
961f7b3672
2개의 변경된 파일9개의 추가작업 그리고 8개의 파일을 삭제
  1. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  2. +5
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java 파일 보기

@@ -218,10 +218,10 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
cardInfo.setRemainingShareFeeAmount(remain_real_pament); cardInfo.setRemainingShareFeeAmount(remain_real_pament);
cardInfo.setUpdateDate(curDate); cardInfo.setUpdateDate(curDate);
// 7.1、消费后修改卡转赠状态 // 7.1、消费后修改卡转赠状态
if (cardInfo.getSupportTransfer().equals(EnumCouponTransfer.YES.getCode())) {
updateCardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode());
cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode());
}
// if (cardInfo.getSupportTransfer().equals(EnumCouponTransfer.YES.getCode())) {
// updateCardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode());
// cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode());
// }
try { try {
wxCardInfoMapper.updateById(updateCardInfo); wxCardInfoMapper.updateById(updateCardInfo);
} catch (Exception e) { } catch (Exception e) {


+ 5
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java 파일 보기

@@ -1509,6 +1509,7 @@ public class WxOrderServiceImpl implements WxOrderService {
cardInfo.setUpdateDate(curr); cardInfo.setUpdateDate(curr);
cardInfo.setOwnerUserId(user.getId()); cardInfo.setOwnerUserId(user.getId());
cardInfo.setCUserId(user.getId()); cardInfo.setCUserId(user.getId());
cardInfo.setSupportTransfer(coupon.getSupportTransfer());
wxCardInfoMapper.updateById(cardInfo); wxCardInfoMapper.updateById(cardInfo);
}else { }else {
cardInfo = new WxCardInfo(); cardInfo = new WxCardInfo();
@@ -1571,10 +1572,10 @@ public class WxOrderServiceImpl implements WxOrderService {
cardInfo.setUpdateDate(curr); cardInfo.setUpdateDate(curr);
cardInfo.setSupportTransfer(coupon.getSupportTransfer()); cardInfo.setSupportTransfer(coupon.getSupportTransfer());
//检查卡是否下架,如果是,不可转赠 //检查卡是否下架,如果是,不可转赠
WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(order.getCouponChannelId(),order.getTenantId());
if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) {
cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode());
}
// WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(order.getCouponChannelId(),order.getTenantId());
// if (wxCouponChannel != null && wxCouponChannel.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) {
// cardInfo.setSupportTransfer(EnumCouponTransfer.NO.getCode());
// }
wxCardInfoMapper.insert(cardInfo); wxCardInfoMapper.insert(cardInfo);
} }
} }


불러오는 중...
취소
저장