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