From de2300311deb4e65138388d1758c535f811740f5 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 25 Jul 2024 17:06:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF=E8=B4=9F?=
 =?UTF-8?q?=E5=80=BC=E4=B8=8D=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java        | 2 +-
 .../system/cashierservice/wxUtil/WxAccountUtil.java       | 8 +++++---
 2 files changed, 6 insertions(+), 4 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 8ebaf84..6d6f849 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -483,7 +483,7 @@ public class CartService {
                 String message = redisUtil.getMessage(RedisCst.SEND_STOCK_WARN_MSG + product.getId() + ":" + item.getOpenId());
                 if (message == null) {
                     wxAccountUtil.sendStockWarnMsg("商品库存不足", product.getName(),
-                            product.getIsDistribute() == 1 ? String.valueOf(product.getStockNumber() - num) : String.valueOf(productSku.getStockNumber() - num)
+                            product.getIsDistribute() == 1 ? product.getStockNumber() - num : (int) (productSku.getStockNumber() - num)
                             , item.getOpenId());
                     redisUtil.saveMessage(RedisCst.SEND_STOCK_WARN_MSG + product.getId() + ":" + item.getOpenId(), product.getId().toString(), 60 * 30L);
                 }else {
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/wxUtil/WxAccountUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/wxUtil/WxAccountUtil.java
index 0bf0132..62d2dfa 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/wxUtil/WxAccountUtil.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/wxUtil/WxAccountUtil.java
@@ -44,7 +44,7 @@ public class WxAccountUtil {
     }
 
     public static void main(String[] args) {
-        sendStockWarnMsg("13213", "31123", "234", "ojC-S6n2DDlpj52iVMoiLL0Ry4HI");
+//        sendStockWarnMsg("13213", "31123", "234", "ojC-S6n2DDlpj52iVMoiLL0Ry4HI");
     }
 
     public static String getRadarQrCode(Integer shopId) {
@@ -98,7 +98,9 @@ public class WxAccountUtil {
         throw new RuntimeException(linkedHashMap.getOrDefault(resObj.get("errcode") + "", "未知错误"));
     }
 
-    public static JSONObject sendStockWarnMsg(String shopName, String productName, String stock,  String toUserOpenId) {
+    public static JSONObject sendStockWarnMsg(String shopName, String productName, Integer stock,  String toUserOpenId) {
+        stock = stock < 0 ? 0 : stock;
+        Integer finalStock = stock;
         Map<String, Object> data = new HashMap<String, Object>() {{
             put("thing22", new HashMap<String, Object>(){{
                 put("value", shopName);
@@ -107,7 +109,7 @@ public class WxAccountUtil {
                 put("value", productName);
             }});
             put("number5", new HashMap<String, Object>(){{
-                put("value", stock);
+                put("value", finalStock);
             }});
         }};
         log.info("开始发送库存预警消息， 接收用户openId: {}, 消息数据: {}", toUserOpenId, data);