From 2a72025df5e4629499ff8fd1ebd2366167674624 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 29 Jul 2025 15:31:29 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=A0=A1=E9=AA=8C=E5=8A=A0=E8=B4=AD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AE=9E=E9=99=85=E8=B4=AD=E4=B9=B0=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/ApiOthSaOrderController.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) 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); } }