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

## 返回判断调整；

This commit is contained in:
cabbage 2025-11-01 19:47:27 +08:00
parent 363addf863
commit 54e97027c9
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -997,14 +997,12 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
GradeDTO oldGradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); GradeDTO oldGradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData();
// 封装等级,重新计算会员等级 // 封装等级,重新计算会员等级
if (setLastCuMemberGrade(cuMember, saOrderExt, saOrderExt.getOrderItemsList())) { if (setLastCuMemberGrade(cuMember, saOrderExt, saOrderExt.getOrderItemsList())) {
log.error("订单异常：{} , 重新计算会员等级", saOrderExt.getOrderCode());
return false; return false;
} }
// 验证等级，原等级<新等级，才可以进行升级 或者 累计升级 // 验证等级，原等级<新等级，才可以进行升级 或者 累计升级
String upgradeWay = querySystemConfigByKey(saOrderExt.getPkCountry(), ESystemConfig.UPGRADE_WAY.getKey()); String upgradeWay = querySystemConfigByKey(saOrderExt.getPkCountry(), ESystemConfig.UPGRADE_WAY.getKey());
boolean checkUpgrade = false; boolean checkUpgrade = false;
if (oldGradeDTO.getGradeValue() >= cuMember.getPkSettleGradeValue() && !Objects.equals(Integer.toString(EUpgradeWay.TOTAL.getValue()), upgradeWay)) { if (oldGradeDTO.getGradeValue() >= cuMember.getPkSettleGradeValue() && !Objects.equals(Integer.toString(EUpgradeWay.TOTAL.getValue()), upgradeWay)) {
log.error("订单异常：{} , oldGradeDTO: {}", saOrderExt.getOrderCode(), oldGradeDTO.getGradeValue());
checkUpgrade = true; checkUpgrade = true;
if (EGrade.VIP.getValue() == oldGradeDTO.getGradeValue()) { if (EGrade.VIP.getValue() == oldGradeDTO.getGradeValue()) {
SaOrderExt gradeOrder = baseMapper.getLastOrderGrade(cuMember.getPkId()); SaOrderExt gradeOrder = baseMapper.getLastOrderGrade(cuMember.getPkId());
@ -1021,7 +1019,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} }
} }
if (checkUpgrade) { if (checkUpgrade) {
log.error("订单异常：{} , checkUpgrade: {}", saOrderExt.getOrderCode(), checkUpgrade);
return false; return false;
} }
// 封装保存订单数据 // 封装保存订单数据
@ -2047,7 +2044,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} else if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType() } else if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()
|| EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { || EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
// 升级订单 // 升级订单
if (payUpgradeSaOrder(saOrderExt, null)) { if (!payUpgradeSaOrder(saOrderExt, null)) {
throw new ServiceException("2.订单处理失败"); throw new ServiceException("2.订单处理失败");
} }
} else { } else {