diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java index b5a8fab2..66d62425 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java @@ -252,25 +252,25 @@ public class ApiOthSaOrderController extends ParentOrderController { } GradeDTO gradeDTO = saOrderHandle.getMemberGradeAndAwardByCountry(BigDecimal.ZERO, achieveAmount, pkCountry, EUpgradeWay.COVER.getValue() + ""); if (null != gradeDTO) { - if (EOrderType.REGISTER_ORDER.getValue() == param.getSpecialArea() - || EOrderType.UPGRADE_ORDER.getValue() == param.getSpecialArea()) { - // 2025.05.13 新添加需求,开网初期报单660给1980等级,报单1980给9900等级 - if (EGrade.YOU_KE.getValue() == gradeDTO.getGradeValue()) { - GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.MAKER.getValue(), pkCountry).getData(); - if (null != newGradeDTO) { - gradeDTO = newGradeDTO; - } - } else if (EGrade.MAKER.getValue() == gradeDTO.getGradeValue()) { - GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.VIP.getValue(), pkCountry).getData(); - if (null != newGradeDTO) { - gradeDTO = newGradeDTO; - } - } - } +// if (EOrderType.REGISTER_ORDER.getValue() == param.getSpecialArea() +// || EOrderType.UPGRADE_ORDER.getValue() == param.getSpecialArea()) { +// // 2025.05.13 新添加需求,开网初期报单660给1980等级,报单1980给9900等级 +// if (EGrade.YOU_KE.getValue() == gradeDTO.getGradeValue()) { +// GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.MAKER.getValue(), pkCountry).getData(); +// if (null != newGradeDTO) { +// gradeDTO = newGradeDTO; +// } +// } else if (EGrade.MAKER.getValue() == gradeDTO.getGradeValue()) { +// GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.VIP.getValue(), pkCountry).getData(); +// if (null != newGradeDTO) { +// gradeDTO = newGradeDTO; +// } +// } +// } // 当前等级可以购买多少加购商品 if (addPurchase > gradeDTO.getBoxNumber()) { vo.setFlag(EYesNo.NO.getIntValue()); - vo.setMsg("当前等级只能购买, " + gradeDTO.getBoxNumber() + " 件加购商品。"); + vo.setMsg("当前等级只能购买 " + gradeDTO.getBoxNumber() + " 件加购商品。"); return AjaxResult.success(vo); } }