From 8d941689d57313c30ae2198a66500addb32286f3 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 5 Aug 2025 10:34:38 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8F=90=E8=B4=A7=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8F=90=E8=B4=A7=E6=95=B0=E9=87=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retail/sale/controller/api/ApiRetailOrderController.java | 2 +- .../sale/controller/service/impl/RetailOrderServiceImpl.java | 4 +++- .../src/main/resources/mapper/activity/pick/AcPickMapper.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java index 2c05d91f..aebec37c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java @@ -485,7 +485,7 @@ public class ApiRetailOrderController { * @param payParam 支付订单入参 * @return */ -// @RepeatSubmit + @RepeatSubmit @PostMapping("/pay-other-order") public AjaxResult payOtherOrder(@Valid @RequestBody RetailOrderPayParam payParam) { // 当前会员ID diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java index 8ea37c25..59d36f9b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java @@ -708,7 +708,9 @@ public class RetailOrderServiceImpl implements IRetailOrderService { if (CollectionUtil.isNotEmpty(pickMemberLogList)) { for (AcPickMemberLog acPickMemberLog : pickMemberLogList) { // 更新会员提货表 - iAcPickService.updateMemberPickById(acPickMemberLog.getPkPick(), acPickMemberLog.getPickQuantity() * -1, acPickMemberLog.getPkMember()); + if (iAcPickService.updateMemberPickById(acPickMemberLog.getPkPick(), acPickMemberLog.getPickQuantity() * -1, acPickMemberLog.getPkMember()) == 0) { + throw new ServiceException("提货订单支付失败，请重试"); + } // 更新会员提货日志表 iAcPickMemberLogService.update(Wrappers.lambdaUpdate() .eq(AcPickMemberLog::getPkId, acPickMemberLog.getPkId()) diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml index 507f528b..68c0faf5 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml @@ -274,7 +274,7 @@ and ap.pk_member = #{pkMember} and ap.pk_id = #{pkId} - and ap.usable_quantity + #{quantity} > 0 + and ap.usable_quantity + #{quantity} >= 0