From 13172e04bd19b0d84c2d3b68c6b274b3937bbbba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 25 Nov 2024 15:59:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=A1=8C=E7=A0=81=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=B0=B1=E9=A4=90=E6=A8=A1=E5=BC=8F=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E4=BF=A1=E6=81=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 e0e91cf..61d9405 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1712,7 +1712,7 @@ public class CartService {
                         .eq(TbCashierCart::getShopId, choseEatModelDTO.getShopId())
                         .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
                         .isNull(TbCashierCart::getOrderId)
-                        .eq(TbCashierCart::getTableId, choseEatModelDTO.getTableId())
+                        .and(r -> r.eq(TbCashierCart::getTableId, choseEatModelDTO.getTableId()).or().isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""))
                         .and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType).or().eq(TbCashierCart::getUseType, ""))
                         .eq(TbCashierCart::getStatus, "create");
             }