From 9da67fc67fdd48f7273362b0bc81666574c5281d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 3 Feb 2026 10:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/ShopInfoController.java  |  4 ++--
 .../main/java/com/czg/account/entity/ShopInfo.java    |  2 +-
 .../java/com/czg/account/service/ShopInfoService.java |  2 +-
 .../account/service/impl/ShopInfoServiceImpl.java     | 11 +++++++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
index 3d9535f5d..7502b17eb 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
@@ -40,8 +40,8 @@ public class ShopInfoController {
     @SaAdminCheckRole("管理员")
     @SaAdminCheckPermission(parentName = "店铺管理接口", value = "shopInfo:list", name = "店铺列表")
     @GetMapping
-    public CzgResult<Page<ShopInfo>> get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop) {
-        return CzgResult.success(shopInfoService.get(pageDTO, shopName, status, isHeadShop));
+    public CzgResult<Page<ShopInfo>> get(PageDTO pageDTO, String profiles, String phone, String shopName, Integer status, Integer isHeadShop) {
+        return CzgResult.success(shopInfoService.get(pageDTO, profiles, phone, shopName, status, isHeadShop));
     }
 
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
index 8ed2ff56e..688e95200 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
@@ -128,7 +128,7 @@ public class ShopInfo implements Serializable {
     private String businessTime;
 
     /**
-     * trial试用版，release正式
+     * probation试用版，release正式
      */
     private String profiles;
 
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 4d951bba3..7afb1669f 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
@@ -30,7 +30,7 @@ public interface ShopInfoService extends IService<ShopInfo> {
      */
     boolean checkSwitch(Long shopId, ShopSwitchTypeEnum switchType) throws ValidateException;
 
-    Page<ShopInfo> get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop);
+    Page<ShopInfo> get(PageDTO pageDTO, String profiles, String phone, String shopName, Integer status, Integer isHeadShop);
 
     Page<ShopInfo> getShopByMainId(PageDTO pageDTO, String shopName, Integer status);
 
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 0e4034cd8..9804cb979 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
@@ -113,8 +113,14 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
     }
 
     @Override
-    public Page<ShopInfo> get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop) {
+    public Page<ShopInfo> get(PageDTO pageDTO, String profiles, String phone, String shopName, Integer status, Integer isHeadShop) {
         QueryWrapper queryWrapper = new QueryWrapper();
+        if (StrUtil.isNotBlank(profiles)) {
+            queryWrapper.eq(ShopInfo::getProfiles, profiles);
+        }
+        if (StrUtil.isNotBlank(phone)) {
+            queryWrapper.like(ShopInfo::getPhone, phone);
+        }
         if (StrUtil.isNotBlank(shopName)) {
             queryWrapper.like(ShopInfo::getShopName, shopName);
         }
@@ -125,7 +131,8 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
             queryWrapper.eq(ShopInfo::getIsHeadShop, isHeadShop);
         }
 
-        List<ShopInfo> shopAllList = getMapper().selectListByQuery(query().select(ShopInfo::getId, ShopInfo::getShopName));
+        List<ShopInfo> shopAllList = getMapper().selectListByQuery(query().select(ShopInfo::getId, ShopInfo::getShopName)
+                .eq(ShopInfo::getIsHeadShop, 1).ne(ShopInfo::getShopType, ShopTypeEnum.ONLY.getValue()));
         Map<Long, String> shopKv = shopAllList.stream().collect(Collectors.toMap(ShopInfo::getId, ShopInfo::getShopName));
         queryWrapper.orderBy(ShopInfo::getCreateTime, false);
         Page<ShopInfo> page = page(new Page<>(pageDTO.page(), pageDTO.size()), queryWrapper);