From d1acc9da712860b46d7114dca6ecbef9fc447a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 24 Oct 2025 09:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=BC=80=E5=85=B3=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=A8=A1=E5=9D=97=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/account/service/ShopConfigService.java   | 2 +-
 .../account/service/impl/FreeDineConfigServiceImpl.java   | 2 +-
 .../account/service/impl/ShopConfigServiceImpl.java       | 8 +++++---
 .../market/service/impl/MkConsumeCashbackServiceImpl.java | 2 +-
 .../market/service/impl/MkShopRechargeServiceImpl.java    | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java
index 565539b4e..aae84f595 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java
@@ -14,5 +14,5 @@ import java.util.List;
  */
 public interface ShopConfigService extends IService<ShopConfig> {
 
-    <T> void editStatusByShopIdList(Long mainShopId, Integer isEnable, LambdaGetter<T> property, String useShopType, List<Long> shopIdList);
+    <T> void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, LambdaGetter<T> property, String useShopType, List<Long> shopIdList);
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java
index 61a620a78..3c2b2eea8 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java
@@ -61,7 +61,7 @@ public class FreeDineConfigServiceImpl extends ServiceImpl<FreeDineConfigMapper,
             config.setShopIdList(JSONArray.toJSONString(freeDineConfigEditDTO.getShopIdList()));
         }
 
-        shopConfigService.editStatusByShopIdList(config.getShopId(), freeDineConfigEditDTO.getEnable() ? 1 : 0, ShopConfig::getIsAccountPay, freeDineConfigEditDTO.getUseShopType(), freeDineConfigEditDTO.getShopIdList());
+        shopConfigService.editStatusByShopIdList(config.getShopId(), freeDineConfigEditDTO.getEnable() ? 1 : 0,true, ShopConfig::getIsAccountPay, freeDineConfigEditDTO.getUseShopType(), freeDineConfigEditDTO.getShopIdList());
         if (freeDineConfigEditDTO.getUseType() != null) {
             config.setUseType(JSONObject.toJSONString(freeDineConfigEditDTO.getUseType()));
         }
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 47f8a8a80..528c0ef3a 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
@@ -41,7 +41,7 @@ public class ShopConfigServiceImpl extends ServiceImpl<ShopConfigMapper, ShopCon
 
 
     @Override
-    public <T> void editStatusByShopIdList(Long mainShopId, Integer isEnable, LambdaGetter<T> property, String useShopType, List<Long> shopIdList) {
+    public <T> void editStatusByShopIdList(Long mainShopId, Integer isEnable,  boolean onyUpValid, LambdaGetter<T> property, String useShopType, List<Long> shopIdList) {
         ShopConfig shopConfig = getOne(new QueryWrapper().eq(ShopConfig::getId, mainShopId));
         if (shopConfig == null) {
             shopConfig = new ShopConfig();
@@ -56,7 +56,7 @@ public class ShopConfigServiceImpl extends ServiceImpl<ShopConfigMapper, ShopCon
             });
         }
 
-        if (isEnable == 0) {
+        if (isEnable == 0 && !onyUpValid) {
             updateChain().or(or -> {
                 or.eq(ShopConfig::getMainId, mainShopId);
             }).or(or -> {
@@ -73,7 +73,9 @@ public class ShopConfigServiceImpl extends ServiceImpl<ShopConfigMapper, ShopCon
                 if (shopIdList.isEmpty()) {
                     updateChain().eq(ShopConfig::getMainId, mainShopId).set(property, 1).update();
                 }else {
-                    updateChain().notIn(ShopConfig::getId, shopIdList).set(property, 0).update();
+                    if (!onyUpValid) {
+                        updateChain().notIn(ShopConfig::getId, shopIdList).set(property, 0).update();
+                    }
                     updateChain().in(ShopConfig::getId, shopIdList).set(property, 1).update();
                 }
             }
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
index 545306183..fa81e3054 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
@@ -101,7 +101,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
             }
         }
 
-        shopConfigService.editStatusByShopIdList(shopId, consumeDiscountDTO.getIsEnable(), ShopConfig::getIsAccountPay,
+        shopConfigService.editStatusByShopIdList(shopId, consumeDiscountDTO.getIsEnable(), true, ShopConfig::getIsAccountPay,
                 consumeDiscountDTO.getUseType(), consumeDiscountDTO.getShopIdList());
 
         if (consumeDiscountDTO.getCashbackStepList() != null && !consumeDiscountDTO.getCashbackStepList().isEmpty()) {
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
index b8d7f689a..babff197e 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
@@ -139,7 +139,7 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
                 shopRechargeDetailService.save(mkShopRechargeDetail);
             });
         }
-        shopConfigService.editStatusByShopIdList(shopId, shopRechargeDTO.getIsEnable(), ShopConfig::getIsAccountPay,
+        shopConfigService.editStatusByShopIdList(shopId, shopRechargeDTO.getIsEnable(), false, ShopConfig::getIsAccountPay,
                 shopRechargeDTO.getUseType(), shopRechargeDTO.getShopIdList());