From ff399ed346334267d075d0ae7586936b680650f7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:28:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 85d2b62..c8de997 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
@@ -6,10 +6,7 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -32,7 +29,7 @@
* 根据id编辑用户
*/
@PostMapping("/app-user/editAppUserById")
- R<Void> editAppUserById(@RequestParam("appUser") AppUser appUser);
+ R<Void> editAppUserById(@RequestBody AppUser appUser);
@PostMapping("/app-user/getCouponCount")
R<Long> getCouponCount(@RequestParam("userId")Long userId, @RequestParam("couponId") Integer couponId );
@@ -43,14 +40,27 @@
@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")
+ 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/getAppUserByPhone")
+ R<AppUser> getAppUserByPhone(@RequestParam("phone") String phone);
+
+ @GetMapping("/app-user/listByIds")
+ List<AppUser> listByIds(List<String> list);
}
--
Gitblit v1.7.1