From 6bc9a2aaa6e6315bd7a052550f89ce9ff3d14ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 21 Nov 2024 15:13:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E6=8A=98=E6=89=A3=E9=87=91=E9=A2=9D=E4=B8=8D=E5=87=86?= =?UTF-8?q?=E7=A1=AE=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 73379fa9..9755afca 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -1457,7 +1457,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { OrderCartInfoDTO cartInfoDTO = new OrderCartInfoDTO(); List allCashierCarts; if (orderId != null) { - allCashierCarts = mpCashierCartService.selectByOrderIdAndState(orderId, null); + allCashierCarts = mpCashierCartService.selectByOrderIdAndState(orderId); }else { allCashierCarts = mpCashierCartService.selectByShopEatType(shopEatTypeInfoDTO, masterId); } @@ -2082,7 +2082,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { private BigDecimal getCartCouponDiscount(TbOrderInfo orderInfo, PayDTO payDTO) { Set productIdSet = new HashSet<>(); - List cashierCarts = mpCashierCartService.selectByOrderIdAndState(orderInfo.getId(), null); + List cashierCarts = mpCashierCartService.selectByOrderIdAndState(orderInfo.getId()); ArrayList activateCartInfo = new ArrayList<>(); for (TbCashierCart cashierCart : cashierCarts) { productIdSet.add(cashierCart.getProductId());