From b3a17aa9d7e2d6561b53c2d69cfb3d7bf841521a Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 5 Jul 2024 17:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E8=BF=94=E8=BF=98=E8=80=97=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index f2bfa2b..80ebd35 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -538,6 +538,7 @@ public class OrderService {
 
 
 
+        log.info("创建订单，发送更新耗材消息，订单id：{}", orderInfo.getId());
         //修改耗材数据
         JSONObject jsonObject=new JSONObject();
         jsonObject.put("orderId",orderInfo.getId());
@@ -801,7 +802,7 @@ public class OrderService {
                 productService.incrStock(cashierCart.getProductId(), cashierCart.getSkuId(), Integer.parseInt(message));
             }
             if (StringUtils.isNotEmpty(cashierCart.getOrderId())) {
-                orderId = Integer.valueOf(cashierCart.getOrderId());
+                orderId = Integer.parseInt(cashierCart.getOrderId());
 
             }
             TbProductWithBLOBs product=  tbProductMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getProductId()));
@@ -815,6 +816,13 @@ public class OrderService {
         }
 
         if (orderId > 0) {
+            // 返还耗材
+            JSONObject jsonObject1=new JSONObject();
+            jsonObject1.put("orderId", orderId);
+            jsonObject1.put("type","delete");
+            log.info("清空购物车 发送返还耗材mq消息，订单id：{}，消息内容：{}", orderId, jsonObject1);
+            producer.cons(jsonObject1.toString());
+
             TbOrderInfo orderInfo = tbOrderInfoMapper.selectByPrimaryKey(orderId);
             if (Objects.nonNull(orderInfo) && !orderInfo.getStatus().equals("pending")){
                 tbOrderInfoMapper.updateStatusById(orderId, "cancelled");