From 3ba8cd9d3e56c929e73f7cb0209198e453b8a27f Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Thu, 23 Oct 2025 17:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=80=E5=9B=9E=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/ShopOrderReturnServiceImpl.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 514ce668..4751eda3 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
@@ -1469,8 +1469,8 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
         ShopOrderReturn shopOrderReturn = new ShopOrderReturn();
         shopOrderReturn.setReturn_state_id(return_next_state_id);
 
-        //商家 收货确认0，增加库存
-        if (ObjectUtil.equal(return_state_id, StateCode.RETURN_PROCESS_RECEIVED)) {
+        //商家 收货确认0，增加库存？todo 流程已改，商家接单或者商家发货都是出库扣减库存的，审核也需要加回来库存
+        if (ObjectUtil.equal(return_state_id, StateCode.RETURN_PROCESS_RECEIVED)||ObjectUtil.equal(return_state_id, StateCode.RETURN_PROCESS_CHECK)) {
             //查询订单退货详情表，得到退货商品数量
             QueryWrapper<ShopOrderReturnItem> returnItemQueryWrapper = new QueryWrapper<>();
             returnItemQueryWrapper.in("return_id", return_ids);
@@ -1508,7 +1508,12 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
                         // 增加库存
                         Integer returnNum = returnItem.getReturn_item_num();
                         if (returnNum != null) {
+                            Integer lestFrozenQuantity= productItem.getItem_quantity_frozen()-returnNum;//增加了退回的库存，也要释放锁定的库存
+                            if (lestFrozenQuantity.compareTo(0) < 0) {
+                                lestFrozenQuantity = 0;
+                            }
                             productItem.setItem_quantity(productItem.getItem_quantity() + returnNum);
+                            productItem.setItem_quantity_frozen(lestFrozenQuantity);
                             if (!shopProductItemService.edit(productItem)) {
                                 logger.error("增加库存失败！商品项ID: {}", itemId);
                                 throw new ApiException(I18nUtil._("增加库存失败！"));