From 6b12805b53f7a6d131b5cffcf45e3b3c68336568 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 09 十二月 2024 10:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 6ee0ca6..df6bffd 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -221,12 +221,16 @@
@ResponseBody
@GetMapping("/change")
@ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
- public R<AppUser> change(@ApiParam("换绑用户id") Long userId){
+ public R<AppUser> change(@ApiParam("换绑用户手机号") String phone){
Long userId1 = tokenService.getLoginUserApplet().getUserid();
- //获取绑定门店
- AppUser user = appUserService.getById(userId1);
- user.setInviteUserId(userId);
- appUserService.updateById(user);
+ AppUser byId = appUserService.getById(userId1);
+ //获取绑定门店
+ AppUser user = appUserService.lambdaQuery().eq(AppUser::getPhone,phone).one();
+ if (user==null){
+ return R.fail("当前手机号未注册");
+ }
+ byId.setInviteUserId(user.getId());
+ appUserService.updateById(byId);
return R.ok();
}
@@ -290,6 +294,17 @@
return R.ok(list);
}
+ /**
+ * 获取用户的直帮上级用户
+ */
+ @ResponseBody
+ @PostMapping("/getSuperiorLeader")
+ @ApiOperation(value = "获取用户的直帮上级用户")
+ public R<AppUser> getSuperiorLeader(@RequestParam("id") Long id) {
+ AppUser superiorLeader = appUserService.getSuperiorLeader(id);
+ return R.ok(superiorLeader);
+ }
+
}
--
Gitblit v1.7.1