From 609d5bb2fe9e4613af0072f2b27dab3b04f25e84 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 29 Jul 2025 18:02:33 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=A4=84=E7=90=86=E5=8A=A0=E8=B4=AD?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E3=80=81=E5=8D=87=E7=BA=A7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/api/ApiOthSaOrderController.java | 8 ++++++-- .../hzs/sale/order/service/impl/SaOrderServiceImpl.java | 9 +++++---- 2 files changed, 11 insertions(+), 6 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 66d62425..4972a261 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 @@ -267,8 +267,12 @@ public class ApiOthSaOrderController extends ParentOrderController { // } // } // } - // 当前等级可以购买多少加购商品 - if (addPurchase > gradeDTO.getBoxNumber()) { + if (gradeDTO.getBoxNumber() == 0) { + vo.setFlag(EYesNo.NO.getIntValue()); + vo.setMsg("当前等级不能购买加购商品。"); + return AjaxResult.success(vo); + } else if (addPurchase > gradeDTO.getBoxNumber()) { + // 当前等级可以购买多少加购商品 vo.setFlag(EYesNo.NO.getIntValue()); vo.setMsg("当前等级只能购买 " + gradeDTO.getBoxNumber() + " 件加购商品。"); return AjaxResult.success(vo); 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 b4ddd5c2..c2f64a17 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 @@ -1041,6 +1041,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 计算下单后等级 GradeDTO gradeDTO = calculateGradeDTO(orderParam.getSpecialArea(), orderParam.getPkSettleCountry(), orderParam.getCenterCodeId(), saOrder, orderReturn); + if (null == gradeDTO) { + orderReturn.setIsEnough(Boolean.FALSE); + return orderReturn; + } if (orderParam.getSpecialArea().equals(EOrderType.REGISTER_ORDER.getValue()) || orderParam.getSpecialArea().equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue())) { @@ -1081,10 +1085,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl } } } - if (gradeDTO == null) { - gradeDTO = GradeDTO.builder().gradeName(null).build(); - orderReturn.setIsEnough(Boolean.FALSE); - } + orderReturn.setPkGradeVal(gradeDTO.getGradeName()); return orderReturn; }