From c98126828926eab3d78979f3a8a9ccd5c9258335 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 27 Sep 2024 15:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/CartService.java   | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 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 c2254ba..793d2c9 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1111,20 +1111,6 @@ public class CartService {
             String shopId = jsonObject.getString("shopId");
             String tableId = jsonObject.getString("tableId");
             Integer userId = TokenUtil.getUserId();
-
-//            List<String> skuIds=new ArrayList<>();
-//            if (redisUtil.exists(RedisCst.TABLE_CART.concat(jsonObject.getString("tableId").concat("-").concat(shopId)))) {
-//                JSONArray array = JSON.parseArray(redisUtil.getMessage(RedisCst.TABLE_CART.concat(jsonObject.getString("tableId").concat("-").concat(shopId))));
-//                if (Objects.isNull(array) || array.isEmpty() || array.size() < 1) {
-//                    for (int i = 0; i < array.size(); i++) {
-//                        TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(array.get(i).toString(), TbCashierCart.class);
-//                        redisUtil.secAdd(RedisCst.PRODUCT + shopId + ":" + jsonObject.getString("skuId"), cashierCart.getNumber().toString());
-//                        productSkuMapper.updateAddStockById(jsonObject.getString("skuId"), cashierCart.getNumber());
-//                        skuIds.add(cashierCart.getSkuId());
-
-//                    }
-//                }
-//            }
             if (StrUtil.isNotBlank(tableId)) {
                 cashierCartMapper.updateStatusByOrderIdForMini(jsonObject.getString("tableId"), "closed");
             }else {
@@ -1135,21 +1121,15 @@ public class CartService {
                         .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
                         .set(TbCashierCart::getStatus, "closed"));
             }
-//            cashierCartMapper.updateStatusByTableId(jsonObject.getString("tableId"), "closed");
             String tableCartKey = RedisCst.getTableCartKey(shopId, tableId, userId);
-            redisUtil.saveMessage(tableCartKey, new JSONArray().toJSONString());
+            redisUtil.deleteByKey(tableCartKey);
+//            redisUtil.saveMessage(tableCartKey, new JSONArray().toJSONString());
             JSONObject jsonObject1 = new JSONObject();
             jsonObject1.put("status", "success");
             jsonObject1.put("msg", "成功");
             jsonObject1.put("type", "addcart");
             jsonObject1.put("amount", BigDecimal.ZERO);
             jsonObject1.put("data", new ArrayList<>());
-//            //修改耗材数据
-//            JSONObject jsonObject2=new JSONObject();
-//            jsonObject2.put("type","delete");
-//            jsonObject2.put("skuIds",skuIds);
-//            jsonObject2.put("shopId",shopId);
-//            producer.cons(jsonObject2.toString());
             PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(), tableCartKey, "", false);
         } catch (Exception e) {
             log.info("长链接错误 clearCart{}", e.getMessage());