From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
index b0ae7fe..8f218df 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
@@ -14,6 +14,7 @@
 import com.ruoyi.system.api.domain.poji.member.Member;
 import com.ruoyi.system.api.domain.poji.shop.Shop;
 import com.ruoyi.system.api.domain.vo.*;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -210,7 +211,7 @@
     * @author jqs34
     * @date 2023/6/18 17:01
     */
-    MgtBulletinBoardVo boardShopTotal();
+    MgtBulletinBoardVo boardShopTotal(List<Long> userIds);
 
     /**
      * @description  商户进件
@@ -452,4 +453,19 @@
      * @return  List<Long>
      */
     List<Shop> listShopByCityCode(List<String> cityCodes);
+
+
+    /**
+     * 根据员工id获取对应的门店
+     * @param userIds
+     * @return
+     */
+    List<Shop> getShopBySysUserIds(List<Long> userIds);
+
+    /**
+     * 根据经销商id查询加盟商ids
+     * @param shopId
+     * @return
+     */
+    List<Shop> getFranchiseeIdsBYDealerId(Long shopId);
 }

--
Gitblit v1.7.1