From d586eb0cacf4b97c7ea20167f806508766e5da8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sun, 28 Sep 2025 18:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=8F=AF=E7=94=A8=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/account/service/ShopInfoService.java    |  2 ++
 .../service/impl/ShopInfoServiceImpl.java       | 17 +++++++++++++++++
 .../service/impl/MkShopRechargeServiceImpl.java |  3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java
index 560f1dae2..885b6f681 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java
@@ -31,4 +31,6 @@ public interface ShopInfoService extends IService<ShopInfo> {
     List<ShopBranchSelectDTO> findShopBranch(Long shopId);
 
     Long getMainIdByShopId(Long shopId);
+
+    List<ShopInfo> getByMainIdOrList(Long mainShopId, List<Long> shopIdList, String shopName);
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
index 42560eb0a..b940b0a8e 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
@@ -428,4 +428,21 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
         return shopInfo.getMainId() == null ? shopId : shopInfo.getMainId();
 
     }
+
+    @Override
+    public List<ShopInfo> getByMainIdOrList(Long mainShopId, List<Long> shopIdList, String shopName) {
+        QueryWrapper queryWrapper = new QueryWrapper().like(ShopInfo::getShopName, shopName);
+        if (shopIdList == null) {
+            queryWrapper.and(q -> {
+                q.eq(ShopInfo::getMainId, mainShopId).or(q1 -> {
+                    q1.eq(ShopInfo::getId, mainShopId);
+                });
+            });
+        }else  {
+            shopIdList.add(mainShopId);
+            queryWrapper.in(ShopInfo::getId, shopIdList);
+        }
+
+        return list(queryWrapper);
+    }
 }
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 1928a2961..5429c797f 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
@@ -225,13 +225,14 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
                     q1.eq(ShopInfo::getId, mainShopId);
                 });
             });
+            shopIdList = null;
         }else  {
             shopIdList.add(shopId);
             queryWrapper.in(ShopInfo::getId, shopIdList);
         }
 
 
-        return shopInfoService.list(queryWrapper)
+        return shopInfoService.getByMainIdOrList(mainShopId, shopIdList, shopName)
                 .stream()
                 .map(shop -> BeanUtil.copyProperties(shop, MkShopRechargeShopListVO.class))
                 .toList();