From 47fb7ff2638f13a17dd2e85ce6993b5c9a983e18 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 21 Oct 2025 15:55:23 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8F=90=E8=B4=A7=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88=E6=8F=90=E8=B4=A7=E5=9F=BA?= =?UTF-8?q?=E6=95=B0=E5=80=8D=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/activity/pick/controller/api/ApiPickController.java | 2 +- .../com/hzs/common/core/constant/msg/ActivityMsgConstants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java index 55324167..05daf478 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/controller/api/ApiPickController.java @@ -217,7 +217,7 @@ public class ApiPickController extends BaseController { // 会员提货商品不存在 return AjaxResult.error(TransactionUtils.getContent(ActivityMsgConstants.PICK_PRODUCT_NOT_EXIST)); } - if (!acPick.getUsableQuantity().equals(param.getQuantity()) && param.getQuantity() % acPick.getBaseQuantity() != 0) { + if (param.getQuantity() < acPick.getBaseQuantity()) { // 提货数量等于可提数量 或 提货数量是提货基数的倍数才能进行处理 return AjaxResult.error(TransactionUtils.getContent(ActivityMsgConstants.PICK_QUANTITY_BASE, acPick.getBaseQuantity())); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java index a8e8f1b4..3516e2d8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java @@ -25,7 +25,7 @@ public class ActivityMsgConstants { /** * 会员提货时，提货数量只能为配置基数的倍数（比如：沙棘果汁一次只能提3箱） -- 提货数量只能为%s的倍数 */ - public static final String PICK_QUANTITY_BASE = "提货数量只能为%s的倍数"; + public static final String PICK_QUANTITY_BASE = "提货数量不能小于提货基数%s"; /** * 会员提货时，不包邮但是邮费模板配置有错误或者缺失 -- 提货邮费计算错误