From f5d9ebf5dcffe43834152be69a0e2fd21be0dd6d Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 22 Sep 2025 11:37:12 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E7=94=9F=E4=BA=A7=E6=88=AA=E6=AD=A210.1?=
 =?UTF-8?q?=EF=BC=8C=E6=B5=8B=E8=AF=95=E6=88=AA=E6=AD=A29.23=EF=BC=8C?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E8=B5=A0=E9=80=81=E7=AD=89=E7=BA=A7=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=B5=A0=E9=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SaOrderServiceImpl.java      | 36 +++++++++++--------
 .../common/core/constant/SysConstants.java    |  9 +++++
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
index f22cb6e1..fcd3cf0a 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
@@ -580,20 +580,28 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
         cuMember.setPkSettleGrade(gradeDTO.getPkId());
         cuMember.setPkSettleGradeValue(gradeDTO.getGradeValue());
 
-        if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()
-                || EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
-            // 2025.05.13 新添加需求，开网初期报单660给1980等级，报单1980给9900等级
-            if (EGrade.YOU_KE.getValue() == gradeDTO.getGradeValue()) {
-                GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.MAKER.getValue(), saOrderExt.getPkCountry()).getData();
-                if (null != newGradeDTO) {
-                    cuMember.setPkSettleGrade(newGradeDTO.getPkId());
-                    cuMember.setPkSettleGradeValue(newGradeDTO.getGradeValue());
-                }
-            } else if (EGrade.MAKER.getValue() == gradeDTO.getGradeValue()) {
-                GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.VIP.getValue(), saOrderExt.getPkCountry()).getData();
-                if (null != newGradeDTO) {
-                    cuMember.setPkSettleGrade(newGradeDTO.getPkId());
-                    cuMember.setPkSettleGradeValue(newGradeDTO.getGradeValue());
+        // 赠送等级截止时间
+        Long giftGradeEnd = SysConstants.GIFT_GRADE_TIME;
+        if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) {
+            // 测试环境
+            giftGradeEnd = SysConstants.GIFT_GRADE_TIME_TEST;
+        }
+        if (System.currentTimeMillis() < giftGradeEnd) {
+            if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()
+                    || EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
+                // 2025.05.13 新添加需求，开网初期报单660给1980等级，报单1980给9900等级
+                if (EGrade.YOU_KE.getValue() == gradeDTO.getGradeValue()) {
+                    GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.MAKER.getValue(), saOrderExt.getPkCountry()).getData();
+                    if (null != newGradeDTO) {
+                        cuMember.setPkSettleGrade(newGradeDTO.getPkId());
+                        cuMember.setPkSettleGradeValue(newGradeDTO.getGradeValue());
+                    }
+                } else if (EGrade.MAKER.getValue() == gradeDTO.getGradeValue()) {
+                    GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.VIP.getValue(), saOrderExt.getPkCountry()).getData();
+                    if (null != newGradeDTO) {
+                        cuMember.setPkSettleGrade(newGradeDTO.getPkId());
+                        cuMember.setPkSettleGradeValue(newGradeDTO.getGradeValue());
+                    }
                 }
             }
         }
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java
index bcc32f5e..27c89077 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java
@@ -44,4 +44,13 @@ public class SysConstants {
      */
     public static final List<Integer> NOT_BONUS_GRADE = Arrays.asList(EGrade.START_UP.getValue(), EGrade.HAI_FAN.getValue());
 
+    /**
+     * 2025.10.01 之前赠送等级，后面不赠送了
+     */
+    public static final Long GIFT_GRADE_TIME = 1759248000000L;
+    /**
+     * 2025.10.01 之前赠送等级，后面不赠送了（测试环境）
+     */
+    public static final Long GIFT_GRADE_TIME_TEST = 1758556800000L;
+
 }