From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
index 60cce7b..53fa050 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
@@ -85,7 +85,7 @@
* @date 2023/6/18 16:45
*/
@PostMapping("/shop/boardShopTotal")
- public R<MgtBulletinBoardVo> boardShopTotal(@RequestBody List<Long> userIds);
+ public R<MgtBulletinBoardVo> boardShopTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto);
/**
* @description 获取平台统计shopId
@@ -207,5 +207,13 @@
* @return
*/
@PostMapping("/shop/getShopBySysUserIds")
- List<Shop> getShopBySysUserIds(@RequestBody List<Long> userIds);
+ List<Shop> getShopBySysUserIds(@RequestBody BoardMemberTotalDto boardMemberTotalDto);
+
+ /**
+ * 根据经销商id查询加盟商ids
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/shop/getFranchiseeIdsBYDealerId")
+ List<Shop> getFranchiseeIdsBYDealerId(@RequestBody Long shopId);
}
--
Gitblit v1.7.1