From 6433360e5ee8361af80c940f816eae951eb26c04 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Sat, 21 Jun 2025 10:20:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BA=97=E9=93=BA=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/small/client/dao/SxDataDao.java   |  2 +-
 .../service/ShopBaseProductCategoryService.java     |  2 +-
 .../impl/ShopBaseProductCategoryServiceImpl.java    | 13 ++++++++-----
 sql/shop/dev/202506021_ddl.sql                      |  2 ++
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 sql/shop/dev/202506021_ddl.sql

diff --git a/client/src/main/java/com/small/client/dao/SxDataDao.java b/client/src/main/java/com/small/client/dao/SxDataDao.java
index 264a7944..47710f22 100644
--- a/client/src/main/java/com/small/client/dao/SxDataDao.java
+++ b/client/src/main/java/com/small/client/dao/SxDataDao.java
@@ -483,7 +483,7 @@ public class SxDataDao extends BaseDao{
                 log.info("剩余批次更新数: {}", Arrays.toString(remainingCounts));
                 conn.commit(); // 最终提交事务
                 log.info("批量更新完成，总记录数: {}" , count);
-                baseUpdateImBrancStock(dataBaseInfo);
+                //baseUpdateImBrancStock(dataBaseInfo);
             } catch (SQLException e) {
                 conn.rollback(); // 出错时回滚整个事务
                 e.printStackTrace();
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductCategoryService.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductCategoryService.java
index ffd983e1..8c0bab77 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductCategoryService.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductCategoryService.java
@@ -92,7 +92,7 @@ public interface ShopBaseProductCategoryService extends IBaseService<ShopBasePro
      *
      * @access public
      */
-    boolean cleanCategoryCache();
+    boolean cleanCategoryCache(String storeId);
 
     /**
      * 获取查询店铺类型
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java
index 4c9174ba..c24836dd 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java
@@ -1034,7 +1034,8 @@ public class ShopBaseProductCategoryServiceImpl extends BaseServiceImpl<ShopBase
             throw new ApiException(String.format(I18nUtil._("商品编号 【%s】使用此分类，不可以删除！"), CollUtil.join(product_ids, ",")));
         }
 
-        cleanCategoryCache();
+        String storeId= ContextUtil.getCurrentUser().getStore_id();
+        cleanCategoryCache(storeId);
 
         return remove(category_id);
     }
@@ -1043,21 +1044,23 @@ public class ShopBaseProductCategoryServiceImpl extends BaseServiceImpl<ShopBase
     public boolean editCategory(ShopBaseProductCategory shopBaseProductCategory) {
         boolean flag = saveOrUpdate(shopBaseProductCategory);
 
-        cleanCategoryCache();
+        cleanCategoryCache(shopBaseProductCategory.getStore_id());
 
         return flag;
     }
 
     @Override
-    public boolean cleanCategoryCache() {
+    public boolean cleanCategoryCache(String storeId) {
         String cache_key = String.format("productCategoryTree:%s", "*");
         Set<String> keys = redisService.keys(cache_key);
 
         if (ObjectUtil.isNotNull(keys)) {
             redisService.del(keys);
         }
-
-        redisService.del(RedisConstant.Product_Cate_Key);
+        String manageKey=RedisConstant.Product_Cate_Key;//清除管理员的key
+        String storeKey=RedisConstant.Product_Cate_Key+":"+storeId;//清除店铺的key
+        redisService.del(storeKey);
+        redisService.del(manageKey);
 
         return true;
     }
diff --git a/sql/shop/dev/202506021_ddl.sql b/sql/shop/dev/202506021_ddl.sql
new file mode 100644
index 00000000..053c11e8
--- /dev/null
+++ b/sql/shop/dev/202506021_ddl.sql
@@ -0,0 +1,2 @@
+alter table shop_product_base modify  `shop_weight` decimal(18,4) default NULL COMMENT '总重量';
+alter table shop_product_base modify `unit_price` decimal(18,4) default NULL COMMENT '单价';
\ No newline at end of file