From 443903147b6682ff4b850e7765ad569f5d45f688 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 27 Sep 2024 16:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E4=B8=8D=E5=85=81=E8=AE=B8?=
=?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=B0=B1=E9=A4=90=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../chaozhanggui/system/cashierservice/service/CartService.java | 1 +
src/main/resources/mapper/TbCashierCartMapper.xml | 2 +-
2 files changed, 2 insertions(+), 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 d87ab3d..60cf019 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1119,6 +1119,7 @@ public class CartService {
.eq(TbCashierCart::getShopId, shopId)
.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""))
.eq(TbCashierCart::getUserId, userId)
+ .ne(TbCashierCart::getProductId, "-999")
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.set(TbCashierCart::getStatus, "closed"));
}
diff --git a/src/main/resources/mapper/TbCashierCartMapper.xml b/src/main/resources/mapper/TbCashierCartMapper.xml
index 74ed684..6ba506a 100644
--- a/src/main/resources/mapper/TbCashierCartMapper.xml
+++ b/src/main/resources/mapper/TbCashierCartMapper.xml
@@ -370,7 +370,7 @@
- update tb_cashier_cart set status = #{status} where table_id = #{tableId} and status = 'create' and master_id is null
+ update tb_cashier_cart set status = #{status} where table_id = #{tableId} and status = 'create' and master_id is null and product_id != '-999'