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 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 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; + }