From 71825a3edffe0dc705a29bcc10d322306461bbf3 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 8 Oct 2024 11:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E6=8E=A5=E5=8F=A3=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=A4=90=E4=BD=8D=E8=B4=B9=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=88=A0=E9=99=A4=E6=97=A7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/CartService.java   | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 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 c749570..e149b7a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -184,25 +184,25 @@ public class CartService {
         boolean ignoreTableFee = shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 1;
 
         TbCashierCart seatCartInfo = null;
-        if (redisUtil.exists(tableCartKey)) {
-            JSONArray jsonArray = JSON.parseArray(redisUtil.getMessage(tableCartKey));
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject object = array.getJSONObject(i);
-                TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class);
-                if ((!TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId()) || !ignoreTableFee) && cashierCart.getNumber() > 0) {
-                   amount = amount.add(new BigDecimal(cashierCart.getTotalNumber()).multiply(cashierCart.getSalePrice().add(cashierCart.getPackFee())));
-                }
-
-                if (TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) {
-                    seatCartInfo = cashierCart;
-                    if (!ignoreTableFee) {
-                        array.add(cashierCart);
-                    }
-                }else {
-                    array.add(cashierCart);
-                }
-            }
-        } else {
+//        if (redisUtil.exists(tableCartKey)) {
+//            JSONArray jsonArray = JSON.parseArray(redisUtil.getMessage(tableCartKey));
+//            for (int i = 0; i < jsonArray.size(); i++) {
+//                JSONObject object = array.getJSONObject(i);
+//                TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class);
+//                if ((!TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId()) || !ignoreTableFee) && cashierCart.getNumber() > 0) {
+//                   amount = amount.add(new BigDecimal(cashierCart.getTotalNumber()).multiply(cashierCart.getSalePrice().add(cashierCart.getPackFee())));
+//                }
+//
+//                if (TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) {
+//                    seatCartInfo = cashierCart;
+//                    if (!ignoreTableFee) {
+//                        array.add(cashierCart);
+//                    }
+//                }else {
+//                    array.add(cashierCart);
+//                }
+//            }
+//        } else {
 
             // 查询购物车所有信息
             LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
@@ -235,7 +235,7 @@ public class CartService {
                 }
                 redisUtil.saveMessage(tableCartKey, array.toString(), 60 * 60 * 12L);
             }
-        }
+//        }
 
         if (ignoreTableFee && seatCartInfo != null) {
             mpCashierCartMapper.deleteById(seatCartInfo.getId());