From d29866da765492301434d3048b5c3a16af30e1b8 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Wed, 9 Oct 2024 13:50:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 cb7523a..ab9f46c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -209,6 +209,7 @@ public class CartService {
                     .eq(TbCashierCart::getShopId, shopId)
                     .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
                     .isNull(TbCashierCart::getOrderId)
+                    .and(q -> q.isNull(TbCashierCart::getUseType).or().eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()))
                     .eq(TbCashierCart::getStatus, "create");
 
             if (StrUtil.isNotBlank(tableId)) {