angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 生产截止10.1，测试截止9.23，之前赠送等级之后不赠送；

This commit is contained in:
cabbage 2025-09-22 11:37:12 +08:00
parent b29fe428f6
commit f5d9ebf5dc
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -580,20 +580,28 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
cuMember.setPkSettleGrade(gradeDTO.getPkId()); cuMember.setPkSettleGrade(gradeDTO.getPkId());
cuMember.setPkSettleGradeValue(gradeDTO.getGradeValue()); cuMember.setPkSettleGradeValue(gradeDTO.getGradeValue());
if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType() // 赠送等级截止时间
|| EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { Long giftGradeEnd = SysConstants.GIFT_GRADE_TIME;
// 2025.05.13 新添加需求，开网初期报单660给1980等级，报单1980给9900等级 if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) {
if (EGrade.YOU_KE.getValue() == gradeDTO.getGradeValue()) { // 测试环境
GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.MAKER.getValue(), saOrderExt.getPkCountry()).getData(); giftGradeEnd = SysConstants.GIFT_GRADE_TIME_TEST;
if (null != newGradeDTO) { }
cuMember.setPkSettleGrade(newGradeDTO.getPkId()); if (System.currentTimeMillis() < giftGradeEnd) {
cuMember.setPkSettleGradeValue(newGradeDTO.getGradeValue()); if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()
} || EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
} else if (EGrade.MAKER.getValue() == gradeDTO.getGradeValue()) { // 2025.05.13 新添加需求，开网初期报单660给1980等级，报单1980给9900等级
GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.VIP.getValue(), saOrderExt.getPkCountry()).getData(); if (EGrade.YOU_KE.getValue() == gradeDTO.getGradeValue()) {
if (null != newGradeDTO) { GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.MAKER.getValue(), saOrderExt.getPkCountry()).getData();
cuMember.setPkSettleGrade(newGradeDTO.getPkId()); if (null != newGradeDTO) {
cuMember.setPkSettleGradeValue(newGradeDTO.getGradeValue()); 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());
}
} }
} }
} }

9
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java
View File

@ -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()); 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;
} }