From 52eead2229da451a4fd1f41b0e2a9ffb04736a5d Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Wed, 24 Sep 2025 18:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=80=9D=E8=BF=85=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=89=A3=E5=87=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/order/service/impl/ShopOrderBaseServiceImpl.java | 3 ++-
 .../shop/sync/service/impl/SyncThirdDataServiceImpl.java  | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index 77eeffa1..6812c641 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -4220,7 +4220,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                     if (!shopProductItemService.edit(shopProductItem)) {
                         throw new ApiException(String.format(I18nUtil._("释放: %s 冻结库存失败!"), order_item_row.getItem_id()));
                     }
-
+                    log.debug("释放库存Item_src_id:{},数量：{}",shopProductItem.getItem_src_id(),order_item_quantity);
                     // RMK 第三方数据同步相关：redis 给这个商品加上对应的库存
                     Map<String, Integer> stockDeltaMap = new HashMap<>();
                     stockDeltaMap.put(Convert.toStr(shopProductItem.getItem_src_id()), order_item_quantity);
@@ -7234,6 +7234,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                                 }
 
                                 // RMK 第三方数据同步相关：redis 给这个商品减去上对应的库存
+                                log.debug("减库存Item_src_id:{},数量：{}",item_src_id,cart_quantity);
                                 Map<String, Integer> stockDeltaMap = new HashMap<>();
                                 stockDeltaMap.put(Convert.toStr(item_src_id), -cart_quantity);
                                 syncThirdDataService.incrProductStockToRedis(stockDeltaMap);
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
index 5bd32952..28d94b10 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
@@ -768,6 +768,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
 
     @Override
     public ThirdApiRes getStoreDataRelease(String appKey, String sign) {
+       // incrProductStockToRedis(new HashMap<>());
         if (StrUtil.isBlank(appKey) || StrUtil.isBlank(sign)) {
             return new ThirdApiRes().fail(1003, I18nUtil._("缺少必要参数！"));
         }
@@ -817,7 +818,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
             // 从 Redis 获取 hash 结构的所有键值对
             String key=RedisKey.STOREDATARELEASE+":"+storeId;
             Map<Object, Object> redisHash = redisTemplate.opsForHash().entries(key);
-            if (redisHash == null || redisHash.isEmpty()) {
+            if (redisHash.isEmpty()) {
                 return Collections.emptyMap();
             }
             // 转换为 Map<String, Integer>
@@ -834,11 +835,12 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
 
     @Override
     public void incrProductStockToRedis(Map<String, Integer> stockDeltaMap) {
+       // stockDeltaMap.put("5458", 1);
         // 校验参数，避免空指针
         if (CollectionUtil.isEmpty(stockDeltaMap)) {
             return;
         }
-
+        logger.debug("扣减库存的map:{}", JSONUtil.toJsonStr(stockDeltaMap));
         for (Map.Entry<String, Integer> entry : stockDeltaMap.entrySet()) {
             String productKey = entry.getKey();
             Integer delta = entry.getValue();
@@ -862,7 +864,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
                 String itemId=productBase.getProduct_number();
                 cn.hutool.json.JSONArray array_item_spec=  JSONUtil.parseArray(spuItem.getItem_spec());
                 if(array_item_spec.isEmpty()){
-                    redisTemplate.opsForHash().increment(key, spuItem.getItem_id(), delta.doubleValue());
+                    redisTemplate.opsForHash().increment(key, itemId, delta.doubleValue());
                     continue;
                 }
                 cn.hutool.json.JSONObject item = (cn.hutool.json.JSONObject) ((cn.hutool.json.JSONObject) array_item_spec.get(0)).get("item");