From 7b333543a7677975aded467deeeff287a0e14299 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, 7 Nov 2024 10:48:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A9=BA=E8=AE=A2=E5=8D=95=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index fe7280a..0c249ec 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -706,7 +706,7 @@ public class OrderService {
         if (!TableConstant.OrderInfo.UseType.TAKEOUT.equalsVals(cashierCart.getUseType())) {
             return;
         }
-        List<TbCashierCart> cashierCarts = mpCashierCartService.selectCart(cashierCart.getUseType(), cashierCart.getMasterId(), Integer.valueOf(cashierCart.getOrderId()), Integer.valueOf(cashierCart.getShopId()));
+        List<TbCashierCart> cashierCarts = mpCashierCartService.selectCart(cashierCart.getUseType(), cashierCart.getMasterId(), cashierCart.getOrderId() == null ? null : Integer.valueOf(cashierCart.getOrderId()), Integer.valueOf(cashierCart.getShopId()));
         if (cashierCarts.isEmpty() && cashierCart.getOrderId() != null) {
             mpOrderDetailService.removeByOrderId(cashierCart.getOrderId());
             mpOrderInfoService.removeById(cashierCart.getOrderId());