From 0406a3a2f3cfb2b081f4ca94352f19f301685c84 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 11:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 dea7127..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获取用户的祖籍列表
*/
@@ -49,8 +52,33 @@
@GetMapping("/appletLogin/getSuperiorLeader")
R<AppUser> getSuperiorLeader(@RequestParam("id") Long id);
-
+ @GetMapping("/app-user/getTopUsers")
+ R<List<AppUser>> getTopUsers();
@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