From 181064a38c53bfa8540b6d8e2a881dfe6744952d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 5 Nov 2025 15:22:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=BF=94=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java
index e8a60c8c9..967a826a1 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java
@@ -55,6 +55,9 @@ public class ShopConfigServiceImpl extends ServiceImpl<ShopConfigMapper, ShopCon
             shopConfig.setId(mainShopId);
             save(shopConfig);
         }
+        if (shopIdList == null) {
+            shopIdList = new ArrayList<>();
+        }
         // 防止报错
         shopIdList.add(-9999L);
         List<Long> extistList;
@@ -68,17 +71,19 @@ public class ShopConfigServiceImpl extends ServiceImpl<ShopConfigMapper, ShopCon
         }
 
         if (isEnable == 0 && !onyUpValid) {
+            List<Long> finalShopIdList = shopIdList;
             updateChain().or(or -> {
                 or.eq(ShopConfig::getId, mainShopId);
             }).or(or -> {
-                or.in(ShopConfig::getId, shopIdList);
+                or.in(ShopConfig::getId, finalShopIdList);
             }).set(property, 0).update();
         }else {
             if ("all".equals(useShopType)) {
+                List<Long> finalShopIdList1 = shopIdList;
                 updateChain().or(or -> {
                     or.eq(ShopConfig::getId, mainShopId);
                 }).or(or -> {
-                    or.in(ShopConfig::getId, shopIdList);
+                    or.in(ShopConfig::getId, finalShopIdList1);
                 }).set(property, 1).update();
             }else {
                 if (shopIdList.isEmpty()) {