From 30ad0fcf1852428c8272af798c89b5912143fab6 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 18 Apr 2025 15:12:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderInfoServiceImpl.java    | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 662c2e09..2d48ccf2 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -4,10 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.ValidateException;
 import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.*;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
@@ -33,6 +30,7 @@ import com.czg.order.service.OrderInfoService;
 import com.czg.order.service.OrderPaymentService;
 import com.czg.order.vo.*;
 import com.czg.product.entity.Product;
+import com.czg.product.service.ProductRpcService;
 import com.czg.product.service.ProductService;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
@@ -89,6 +87,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @DubboReference
     private ProductService productService;
     @DubboReference
+    private ProductRpcService productRpcService;
+    @DubboReference
     private ShopInfoService shopInfoService;
     @DubboReference
     private UserInfoService userInfoService;
@@ -1033,6 +1033,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 .eq(OrderInfo::getId, orderId)
                 .update();
         redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId());
+        rabbitPublisher.sendOrderCancelMsg(orderInfo.getId().toString());
         return true;
     }
 
@@ -1053,9 +1054,22 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     .eq(OrderInfo::getShopId, shopId)
                     .eq(OrderInfo::getId, orderId)
                     .update();
+            rabbitPublisher.sendOrderCancelMsg(orderInfo.getId().toString());
             return true;
         }
+        List<OrderDetail> details = orderDetailService.list(QueryWrapper.create().eq(OrderDetail::getOrderId, orderId).eq(OrderDetail::getPlaceNum, placeNum));
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        for (OrderDetail detail : details) {
+            Map<String, Object> data = new HashMap<>();
+            data.put("shopId", shopId);
+            data.put("productId", detail.getProductId());
+            data.put("num", NumberUtil.sub(detail.getNum(), detail.getReturnNum()));
+            dataList.add(data);
+        }
         orderDetailService.remove(new QueryWrapper().eq(OrderDetail::getOrderId, orderId).eq(OrderDetail::getPlaceNum, placeNum));
+        if (CollUtil.isNotEmpty(dataList)) {
+            productRpcService.orderCancelRecoverStock(shopId, orderId, dataList);
+        }
         List<OrderDetail> list = orderDetailService.queryChain().eq(OrderDetail::getOrderId, orderId).eq(OrderDetail::getShopId, shopId).list();
         if (CollUtil.isEmpty(list)) {
             updateChain()