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._("增加库存失败！"));