From f18a802137a7642473891f6886d44cf0c229efed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 一月 2025 18:09:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 7e4e812..94c67a5 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,20 +40,28 @@
@GetMapping("/appUserShop/shop/{userId}")
R<List<AppUserShop>> getAppUserShop(@PathVariable("userId") Long userId);
+ @PostMapping("/appUserShop/addAppUserShop")
+ R<Void> addAppUserShop(@RequestBody AppUserShop appUserShop);
+
/**
* 根据用户id获取用户的祖籍列表
*/
@GetMapping("/appletLogin/getUserAncestorList")
R<List<AppUser>> getUserAncestorList(@RequestParam("id") Long id);
- @GetMapping("/appletLogin/getSuperiorLeader")
+ @PostMapping("/app-user/getSuperiorLeader")
R<AppUser> getSuperiorLeader(@RequestParam("id") Long id);
-
+ @PostMapping("/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
@@ -61,7 +69,7 @@
*/
@PostMapping("/app-user/getAppUserByName")
R<List<AppUser>> getAppUserByName(@RequestParam("name") String name);
-
+
/**
* 根据用户电话模糊搜索用户列表
* @param phone
@@ -69,4 +77,33 @@
*/
@PostMapping("/app-user/getAppUserByPhone")
R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone);
+
+
+ @PostMapping("/app-user/getAppUserByPhone1")
+ R<AppUser> getAppUserByPhone1(@RequestParam("phone") String phone);
+
+
+
+ /**
+ * 检查会员等级变更
+ * @param appUserId
+ */
+ @PostMapping("/app-user/vipUpgrade")
+ void vipUpgrade(@RequestParam("appUserId") Long appUserId);
+
+
+ /**
+ * 用户降级检测
+ */
+ @PostMapping("/app-user/demotionDetection")
+ void demotionDetection();
+
+
+ /**
+ * 清空绑定门店的用户门店数据
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/app-user/clearBindShop")
+ R clearBindShop(@RequestParam("shopId") Integer shopId);
}
--
Gitblit v1.7.1