From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
index 43819bb..a9d893c 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -40,6 +40,9 @@
 	@GetMapping("/appUserShop/shop/{userId}")
 	R<List<AppUserShop>> getAppUserShop(@PathVariable("userId") Long userId);
 
+	@PostMapping("/appUserShop/addAppUserShop")
+	R<Void> addAppUserShop(@RequestBody AppUserShop appUserShop);
+
 	/**
 	 * 根据用户id获取用户的祖籍列表
 	 */
@@ -54,4 +57,28 @@
 
 	@PostMapping("/app-user/getVipCount")
 	R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId );
+
+
+	@GetMapping("/app-user/listByIds")
+	List<AppUser> listByIds(@RequestParam("ids") List<Long> list);
+
+	/**
+	 * 根据用户名称模糊搜索用户列表
+	 * @param name
+	 * @return
+	 */
+	@PostMapping("/app-user/getAppUserByName")
+	R<List<AppUser>> getAppUserByName(@RequestParam("name") String name);
+
+	/**
+	 * 根据用户电话模糊搜索用户列表
+	 * @param phone
+	 * @return
+	 */
+	@PostMapping("/app-user/getAppUserByPhone")
+	R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone);
+
+
+	@PostMapping("/app-user/getAppUserByPhone1")
+	R<AppUser> getAppUserByPhone1(String phone);
 }

--
Gitblit v1.7.1