From 6de96144730efdb3ab10cc03c743151b62ef609d Mon Sep 17 00:00:00 2001
From: wangguocheng <jing121710@sina.com>
Date: Wed, 15 May 2024 09:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/rabbit/CartConsumer.java    |  4 +++-
 .../cashierservice/service/CartService.java    | 18 ++++++++++++++++++
 .../service/IntegralService.java               |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/CartConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/CartConsumer.java
index 4782ffc..de871ca 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/CartConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/CartConsumer.java
@@ -50,7 +50,9 @@ public class CartConsumer {
                     throw new MsgException("商品数量错误");
                 }
                 cartService.createCart(jsonObject);
-            }else if(jsonObject.getString("type").equals("createOrder")){
+            }else if (jsonObject.getString("type").equals("queryCart") ) {
+                cartService.queryCart(jsonObject);
+            } else if(jsonObject.getString("type").equals("createOrder")){
                 String cartDetail = redisUtil.getMessage(RedisCst.TABLE_CART.concat(tableId).concat("-").concat(shopId));
                 if (StringUtils.isEmpty(cartDetail)){
                     throw new MsgException("购物车为空无法下单");
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 2ca08a8..110d980 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -701,4 +701,22 @@ public class CartService {
             e.getMessage();
         }
     }
+
+    public void queryCart(JSONObject jsonObject) throws IOException {
+        String shopId = jsonObject.getString("shopId");
+        JSONArray array = JSON.parseArray(redisUtil.getMessage(RedisCst.TABLE_CART.concat(jsonObject.getString("tableId").concat("-").concat(shopId))));
+        BigDecimal amount = BigDecimal.ZERO;
+        for (int i = 0; i < array.size(); i++) {
+            JSONObject object = array.getJSONObject(i);
+            TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class);
+                amount = amount.add(new BigDecimal(cashierCart.getNumber()).multiply(cashierCart.getSalePrice().add(cashierCart.getPackFee())));
+        }
+        JSONObject jsonObject1 = new JSONObject();
+        jsonObject1.put("status", "success");
+        jsonObject1.put("msg", "成功");
+        jsonObject1.put("type", jsonObject.getString("type"));
+        jsonObject1.put("data", array);
+        jsonObject1.put("amount", amount);
+        AppWebSocketServer.AppSendInfo(jsonObject1, jsonObject.getString("tableId").concat("-").concat(shopId), false);
+    }
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/IntegralService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/IntegralService.java
index 057e418..b9e520e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/IntegralService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/IntegralService.java
@@ -93,6 +93,7 @@ public class IntegralService {
                 log.error("该店铺未开启优惠券功能");
                 return;
             }
+
             TbParams params = tbShopUserMapper.selectParams();
             TbUserCoupons userCoupons = new TbUserCoupons();
             userCoupons.setUserId(orderInfo.getUserId());