From 2cc6e4d1ebc8ee1d9d3e568e2cd8c4ae58190863 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 20 May 2025 09:03:20 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=96=B0=E6=8B=93=E5=B1=95=E6=94=B6?=
 =?UTF-8?q?=E7=9B=8A=E7=AE=97=E6=B3=95=EF=BC=8C5=E6=9C=8820=E5=8F=B7?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E8=B5=B0=E8=80=81=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E4=B9=8B=E5=90=8E=E8=B5=B0=E6=96=B0=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/bonus/service/impl/BonusSettleServiceImpl.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;
+            }
 
             // 根据日期开始计算网体 + 业绩
             //********************* 更新网体*************/