From e5e3bbc9f855e0b2abf707ab80a400ed2edf1a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Sat, 23 Nov 2024 10:24:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E6=83=A0=E5=88=B8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/CartService.java | 20 ++++++++++++++++--- .../cashierservice/service/PayService.java | 1 + 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index 3c3c24f..493c91c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1433,18 +1433,32 @@ public class CartService { // 获取台桌信息 TbShopTable shopTable = getTableInfoByEatType(shopEatTypeInfoDTO); - // 获取详细的购物车信息 - OrderCartInfoDTO cartInfoDTO = getCartInfoForOrder(shopEatTypeInfoDTO, cashierCartList, shopTable, tbShopUser); + // 获取订单信息 TbOrderInfo orderInfo = null; - if (cartInfoDTO.getOrderId() != null) { + OrderCartInfoDTO cartInfoDTO = null; + if (orderDTO.getOrderId() != null) { orderInfo = mpOrderInfoMapper.selectById(cartInfoDTO.getOrderId()); if (!"unpaid".equals(orderInfo.getStatus())) { return Result.fail("订单正在支付中，请稍后再试"); } // 返还上次使用的券 returnCoupon(orderInfo); + cartInfoDTO = getCartInfoForOrder(shopEatTypeInfoDTO, cashierCartList, shopTable, tbShopUser); + }else { + // 获取详细的购物车信息 + cartInfoDTO = getCartInfoForOrder(shopEatTypeInfoDTO, cashierCartList, shopTable, tbShopUser); + if (cartInfoDTO.getOrderId() != null) { + orderInfo = mpOrderInfoMapper.selectById(cartInfoDTO.getOrderId()); + if (!"unpaid".equals(orderInfo.getStatus())) { + return Result.fail("订单正在支付中，请稍后再试"); + } + // 返还上次使用的券 + returnCoupon(orderInfo); + } + + cartInfoDTO = getCartInfoForOrder(shopEatTypeInfoDTO, cashierCartList, shopTable, tbShopUser); } // 获取优惠券信息 diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 57dab7d..27b0864 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -505,6 +505,7 @@ public class PayService { orderInfo.setUserCouponId(null); orderInfo.setUseCouponInfo(null); orderInfo.setFullCouponDiscountAmount(BigDecimal.ZERO); + orderInfo.setProductCouponDiscountAmount(BigDecimal.ZERO); // 修改购物车券信息 cashierCartMapper.update(null, new LambdaUpdateWrapper()