From 688f73b4b375e6a8370fe8bad5ac5463875e978c Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sun, 29 Sep 2024 13:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E9=A4=90=E6=A8=A1=E5=BC=8F=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/CartService.java   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 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 b507fe5..173b206 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -178,20 +178,20 @@ public class CartService {
         }
         String tableCartKey = RedisCst.getTableCartKey(shopId, tableId, userId);
         TbCashierCart seatCartInfo = null;
-        if (redisUtil.exists(tableCartKey)) {
-            array = JSON.parseArray(redisUtil.getMessage(tableCartKey));
-            for (int i = 0; i < array.size(); i++) {
-                JSONObject object = array.getJSONObject(i);
-                TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class);
-                if (cashierCart.getNumber() > 0) {
-                    amount = amount.add(new BigDecimal(cashierCart.getTotalNumber()).multiply(cashierCart.getSalePrice().add(cashierCart.getPackFee())));
-                }
-
-                if ("-999".equals(cashierCart.getProductId())) {
-                    seatCartInfo = cashierCart;
-                }
-            }
-        } else {
+//        if (redisUtil.exists(tableCartKey)) {
+//            array = JSON.parseArray(redisUtil.getMessage(tableCartKey));
+//            for (int i = 0; i < array.size(); i++) {
+//                JSONObject object = array.getJSONObject(i);
+//                TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class);
+//                if (cashierCart.getNumber() > 0) {
+//                    amount = amount.add(new BigDecimal(cashierCart.getTotalNumber()).multiply(cashierCart.getSalePrice().add(cashierCart.getPackFee())));
+//                }
+//
+//                if ("-999".equals(cashierCart.getProductId())) {
+//                    seatCartInfo = cashierCart;
+//                }
+//            }
+//        } else {
             // 查询购物车所有信息
             LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
                     .eq(TbCashierCart::getShopId, shopId)
@@ -215,9 +215,9 @@ public class CartService {
                     if (cashierCart.getIsVip().equals((byte) 1)) continue;
                     amount = amount.add(new BigDecimal(cashierCart.getTotalNumber()).multiply(cashierCart.getSalePrice().add(cashierCart.getPackFee())));
                 }
-                redisUtil.saveMessage(tableCartKey, array.toString());
+                redisUtil.saveMessage(tableCartKey, array.toString(), 60 * 60 * 12L);
             }
-        }
+//        }
 
         redisUtil.saveMessage(RedisCst.getCurrentTableSeatCount(shopEatTypeInfoDTO.getShopInfo().getId(), tableId), JSONObject.toJSONString(seatCartInfo), 60 * 60 * 12L);