From 5e20bdf96202eeb75d28eb946c07d2a3371ab6d3 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sun, 29 Sep 2024 16:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=9B=E5=BB=BA=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=20=E5=88=87=E6=8D=A2=E5=B0=B1=E9=A4=90=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/CartService.java   | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 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 8d1cbf6..23f5064 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1583,15 +1583,30 @@ public class CartService {
 
     public List<TbCashierCart> choseEatModel(ChoseEatModelDTO choseEatModelDTO) {
         Integer userId = TokenUtil.getUserId();
-        // 查询购物车所有信息
-        LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
-                .eq(TbCashierCart::getShopId, choseEatModelDTO.getShopId())
-                .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
-                .eq(TbCashierCart::getStatus, "create");
-        // 外带模式
-        queryWrapper.eq(TbCashierCart::getUserId, userId);
+        List<TbCashierCart> cashierCartList;
+        if (choseEatModelDTO.getType() == 0) {
+            // 查询购物车所有信息
+            LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
+                    .eq(TbCashierCart::getShopId, choseEatModelDTO.getShopId())
+                    .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
+                    .isNull(TbCashierCart::getOrderId)
+                    .eq(TbCashierCart::getStatus, "create");
+            // 外带模式
+            queryWrapper.eq(TbCashierCart::getUserId, userId);
+            cashierCartList = mpCashierCartMapper.selectList(queryWrapper);
+        }else {
+            cashierCartList = new ArrayList<>();
+            String tableCartKey = RedisCst.getTableCartKey(choseEatModelDTO.getShopId().toString(), choseEatModelDTO.getTableId(), userId);
+            String message = redisUtil.getMessage(tableCartKey);
+            if (StrUtil.isNotBlank(message)) {
+                JSONObject.parseArray(message).forEach(item -> {
+                    TbCashierCart cart = JSONObject.parseObject(item.toString(), TbCashierCart.class);
+                    cashierCartList.add(cart);
+                });
+            }
+        }
 
         // 所有订单信息
-        return mpCashierCartMapper.selectList(queryWrapper);
+        return cashierCartList;
     }
 }