From 2ed1fba1918cf9b28b3810671b8d3ddd6a6c1179 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Thu, 27 Nov 2025 17:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=9D=E8=BF=85=E5=90=8C=E6=AD=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=97=A0=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E4=B9=9F=E8=A6=81=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopOrderReturnServiceImpl.java      | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
index b74327ad..c29626ae 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
@@ -1643,10 +1643,40 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
                             }
                             stockDeltaMap.put(mapKey, returnNum);
                             syncThirdDataService.incrProductStockToRedis(stockDeltaMap, returnItem.getReturn_item_subtotal());
-                            logger.info("退货返回给思迅,存入redis成功,item_src_id:{},订单号：{},数量：{},mapKey:{}", item_src_id, shopOrderReturn.getOrder_id(), returnNum,mapKey);
+                            logger.info("退货返回给思迅,存入redis成功,item_src_id:{},订单号：{},数量：{},mapKey:{}", item_src_id, shopOrderItem.getOrder_id(), returnNum,mapKey);
                         } else {
                             logger.warn("退货数量为空，无法增加库存，订单项ID: {}", orderItemId);
                         }
+                    }else {//没有出库也要做思迅出库，在客户端计算支付流水，防止部分数据有出无进
+                        Long orderItemId = returnItem.getOrder_item_id();
+                        ShopOrderItem shopOrderItem = shopOrderItemService.get(orderItemId);
+                        if (shopOrderItem == null) {
+                            logger.error("该订单商品表信息不存在！订单项ID: {}", orderItemId);
+                            throw new ApiException(I18nUtil._("该订单商品表信息不存在！"));
+                        }
+
+                        Long itemId = shopOrderItem.getItem_id();
+                        ShopProductItem productItem = shopProductItemService.get(itemId);
+
+                        if (productItem == null) {
+                            logger.error("该订单商品表-SKU表信息不存在！商品项ID: {}", itemId);//说明这个itemid已经不存在了，不对库存操作
+                            continue;
+                        }
+
+                        // 增加库存
+                        Integer returnNum = returnItem.getReturn_item_num();
+                        if (returnNum != null) {
+                            // RMK 第三方数据同步相关：redis 新增返还思迅库存
+                            Map<String, Integer> stockDeltaMap = new HashMap<>();
+                            String item_src_id = productItem.getItem_src_id();
+                            String mapKey=item_src_id + "-" + shopOrderItem.getOrder_id() + "-" + shopOrderItem.getOrder_item_unit_price();
+                            if(null!=shopOrderReturnMap.get(returnItem.getReturn_id())){
+                                mapKey=mapKey+"-" + shopOrderReturnMap.get(returnItem.getReturn_id());//时间
+                            }
+                            stockDeltaMap.put(mapKey, returnNum);
+                            syncThirdDataService.incrProductStockToRedis(stockDeltaMap, returnItem.getReturn_item_subtotal());
+                            logger.info("未出库退货返回给思迅,存入redis成功,item_src_id:{},订单号：{},数量：{},mapKey:{}", item_src_id, shopOrderItem.getOrder_id(), returnNum,mapKey);
+                        }
                     }
                 }
             }