From c980c8c2cd9403393db6a3f42705612a0a4d4511 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:49:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java | 9 ++++++++-
1 files changed, 8 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 bbc7986..cf409f1 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
@@ -6,11 +6,13 @@
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.factory.ShopClientFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
+import java.util.Set;
/**
* @author zhibing.pu
@@ -27,7 +29,9 @@
*/
@PostMapping("/shop/getShopById")
R<Shop> getShopById(@RequestParam("id") Integer id);
-
+
+ @PostMapping("/shop/getShopByUserId")
+ R<List<Shop>> getShopByUserId(@RequestParam("id") Long id);
/**
* 根据店铺管理员电话获取门店数据
@@ -39,4 +43,7 @@
@PostMapping("/getShopByUserIds")
public R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);
+
+ @GetMapping("/getShopIdByName")
+ R<Set<Integer>> getShopIdByName(String shopName);
}
--
Gitblit v1.7.1