From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 e05fb0c..ccdaac6 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
@@ -3,6 +3,7 @@
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.dto.ShopAnalysisDTO;
 import com.ruoyi.other.api.factory.ShopClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -63,7 +64,7 @@
 	 * 获取所有门店
 	 * @return
 	 */
-	@PostMapping("/shop/getAllShop")
+	@GetMapping("/shop/getAllShop")
 	R<List<Shop>> getAllShop();
 
 
@@ -74,7 +75,7 @@
 	 * 获取指定用户的服务商
 	 */
 	@GetMapping("/shop/getServiceProvider")
-	R<Shop> getServiceProvider(@RequestParam("appUserId") Long appUserId);
+	R<List<String>> getServiceProvider(@RequestParam("appUserId") Long appUserId);
 
 	/**
 	 * 获取指定用户的高级服务商
@@ -82,5 +83,9 @@
 	@GetMapping("/shop/getSuperiorServiceProvider")
 	public R<Shop> getSuperiorServiceProvider(@RequestParam("appUserId") Long appUserId);
 
+	@PostMapping("/shop/getIncomeAnalysis")
+    R<Map<String, Object>> getIncomeAnalysis(@RequestBody ShopAnalysisDTO shopAnalysisDTO);
 
+	@PostMapping("/shop/insert")
+    R insert(@RequestBody Shop shop);
 }

--
Gitblit v1.7.1