From 18b2c536f3061d43159dd7a0a1ed5ee966b21795 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Mon, 7 Apr 2025 18:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=BA=97=E9=93=BA=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/admin/ShopBranchController.java | 6 ++++--
 .../java/com/czg/account/service/ShopBranchService.java     | 5 +++--
 .../com/czg/service/account/mapper/ShopConfigMapper.java    | 4 ++--
 .../service/account/service/impl/ShopBranchServiceImpl.java | 5 +++--
 .../src/main/resources/mapper/ShopConfigMapper.xml          | 3 +++
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopBranchController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopBranchController.java
index 95f1ca7b..67ae27b0 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopBranchController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopBranchController.java
@@ -1,6 +1,7 @@
 package com.czg.controller.admin;
 
 import com.czg.account.dto.ShopBranchDTO;
+import com.czg.account.param.ShopBranchParam;
 import com.czg.account.service.ShopBranchService;
 import com.czg.log.annotation.OperationLog;
 import com.czg.resp.CzgResult;
@@ -27,9 +28,10 @@ public class ShopBranchController {
      */
     @GetMapping("page")
     @OperationLog("分店管理-分页")
-    public CzgResult<Page<ShopBranchDTO>> getBranchPage() {
+    public CzgResult<Page<ShopBranchDTO>> getBranchPage(ShopBranchParam param) {
         Long shopId = StpKit.USER.getShopId(0L);
-        Page<ShopBranchDTO> data = shopBranchService.findPage(shopId);
+        param.setShopId(shopId);
+        Page<ShopBranchDTO> data = shopBranchService.findPage(param);
         return CzgResult.success(data);
     }
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopBranchService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopBranchService.java
index 9c178a2b..00e1eb68 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopBranchService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopBranchService.java
@@ -1,6 +1,7 @@
 package com.czg.account.service;
 
 import com.czg.account.dto.ShopBranchDTO;
+import com.czg.account.param.ShopBranchParam;
 import com.mybatisflex.core.paginate.Page;
 
 /**
@@ -13,10 +14,10 @@ public interface ShopBranchService {
     /**
      * 查询分店列表
      *
-     * @param shopId 主店id
+     * @param param 查询入参
      * @return 分店列表
      */
-    Page<ShopBranchDTO> findPage(Long shopId);
+    Page<ShopBranchDTO> findPage(ShopBranchParam param);
 
     /**
      * 设计数据同步方式
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopConfigMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopConfigMapper.java
index 26719074..97074ef8 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopConfigMapper.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopConfigMapper.java
@@ -2,9 +2,9 @@ package com.czg.service.account.mapper;
 
 import com.czg.account.dto.ShopBranchDTO;
 import com.czg.account.entity.ShopConfig;
+import com.czg.account.param.ShopBranchParam;
 import com.mybatisflex.core.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,6 +17,6 @@ import java.util.List;
 @Mapper
 public interface ShopConfigMapper extends BaseMapper<ShopConfig> {
 
-    List<ShopBranchDTO> findBranchList(@Param("shopId") Long shopId);
+    List<ShopBranchDTO> findBranchList(ShopBranchParam param);
 
 }
\ No newline at end of file
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopBranchServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopBranchServiceImpl.java
index b3f804aa..856f782f 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopBranchServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopBranchServiceImpl.java
@@ -6,6 +6,7 @@ import com.czg.account.entity.ShopConfig;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.enums.BranchDataSyncMethodEnum;
 import com.czg.account.enums.ShopTypeEnum;
+import com.czg.account.param.ShopBranchParam;
 import com.czg.account.service.ShopBranchService;
 import com.czg.enums.YesNoEnum;
 import com.czg.exception.CzgException;
@@ -38,9 +39,9 @@ public class ShopBranchServiceImpl implements ShopBranchService {
     private ShopInfoMapper shopInfoMapper;
 
     @Override
-    public Page<ShopBranchDTO> findPage(Long shopId) {
+    public Page<ShopBranchDTO> findPage(ShopBranchParam param) {
         PageHelper.startPage(PageUtil.buildPageHelp());
-        List<ShopBranchDTO> branchList = shopConfigMapper.findBranchList(shopId);
+        List<ShopBranchDTO> branchList = shopConfigMapper.findBranchList(param);
         return PageUtil.convert(new PageInfo<>(branchList));
     }
 
diff --git a/cash-service/account-service/src/main/resources/mapper/ShopConfigMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopConfigMapper.xml
index 8cdf3252..d5c6a632 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopConfigMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopConfigMapper.xml
@@ -12,5 +12,8 @@
         left join tb_shop_info t2 on t1.id = t2.id
         left join sys_user t3 on t1.id = t3.id
         where t1.main_id = #{shopId}
+        <if test="branchName != null and branchName != ''">
+        and t2.shop_name like concat('%', #{branchName}, '%')
+        </if>
     </select>
 </mapper>
\ No newline at end of file