From bafc281a10b0d558cbdd9a330c41a9a4a293e970 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Wed, 25 Sep 2024 18:04:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 7268225..9b56805 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -181,7 +181,15 @@ public class CartService {
                 }
             }
         } else {
-            List<TbCashierCart> tbCashierCarts = cashierCartMapper.selectByShopIdAndTableId(shopId, tableId);
+            // 查询购物车所有信息
+            LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
+                    .eq(TbCashierCart::getShopId, shopId)
+                    .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -3).getTime())
+                    .eq(TbCashierCart::getUserId, userId)
+                    .isNull(TbCashierCart::getOrderId)
+                    .eq(TbCashierCart::getStatus, "create");
+
+            List<TbCashierCart> tbCashierCarts =  mpCashierCartMapper.selectList(queryWrapper);;
             if (!CollectionUtils.isEmpty(tbCashierCarts)) {
                 for (TbCashierCart cashierCart : tbCashierCarts) {
                     array.add(cashierCart);
@@ -772,7 +780,7 @@ public class CartService {
                     orderId = Integer.valueOf(cart.getOrderId());
                 }
 
-                cart.setStatus("final");
+                cart.setStatus(shopEatTypeInfoDTO.isDineInAfter() ? "create" : "final");
                 if (cart.getId() != null) {
                     mpCashierCartMapper.updateById(cart);
                 } else {