From f615ec5c9239327740948501627545f8e78e2a9e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 09:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
index e5a5a73..d561b63 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
@@ -50,6 +50,9 @@
@PostMapping("/shop/getShopIdByName")
R<Set<Integer>> getShopIdByName(@RequestParam("shopName") String shopName);
+ @PostMapping("/shop/getManagerByManagerName")
+ R<Set<Long>> getManagerByManagerName(@RequestParam("managerName") String managerName);
+
@PostMapping("/shop-balance-statement/getList")
R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestBody ShopBalanceStatement shopBalanceStatement);
@@ -70,5 +73,19 @@
@GetMapping("/shop/getShopStatistics")
- public R<Map<String, BigDecimal>> getShopStatistics();
+ public R<Map<String, BigDecimal>> getShopStatistics(@RequestParam("shopId") Integer shopId);
+
+ /**
+ * 获取指定用户的服务商
+ */
+ @GetMapping("/shop/getServiceProvider")
+ R<Shop> getServiceProvider(@RequestParam("appUserId") Long appUserId);
+
+ /**
+ * 获取指定用户的高级服务商
+ */
+ @GetMapping("/shop/getSuperiorServiceProvider")
+ public R<Shop> getSuperiorServiceProvider(@RequestParam("appUserId") Long appUserId);
+
+
}
--
Gitblit v1.7.1