diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index fa505cbd..f5bf87cf 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -22,6 +22,7 @@ import com.hzs.bonus.detail.service.ICuMemberAwardsService; import com.hzs.bonus.detail.service.ICuMemberLevelService; import com.hzs.bonus.risk.service.ICuMemberRiskControlService; import com.hzs.bonus.swing.service.ICuMemberSwingNetLogService; +import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.BonusFieldConstants; import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.MagicNumberConstants; @@ -154,7 +155,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { private BonusSettleMallHandle bonusSettleMallHandle; // 新拓展处理时间 - private final String newExpandDate = "2025-05-01"; + private final String newExpandDate = "2025-06-01"; @Override @Transactional(rollbackFor = Exception.class) @@ -395,6 +396,9 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // TODO 2025.05.14 新拓展处理在2025.06.01之前还是走原来的1:1对碰,之后走1:2对碰 // true 走新逻辑(首购+复购 合并计算) boolean newExpandFlag = settleDate.compareTo(newExpandDate) >= 0; + if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { + newExpandFlag = settleDate.compareTo("2025-05-20") >= 0; + } // 根据日期开始计算网体 + 业绩 //********************* 更新网体*************/