From 43d63ea7be939e33861ad8edd001de5cb8124ac0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 11:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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 d42a490..3c5e0b5 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
@@ -421,6 +421,7 @@
}
+
@GetMapping("/danger/info")
@ApiOperation(value = "用户列表-保级条件详情", tags = {"管理后台"})
public R<DangerInfoDto> dangerinfo(Long id)
@@ -481,6 +482,42 @@
appUserService.updateById(byId);
return R.ok();
}
+
+ @GetMapping("/select")
+ @ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})
+ public R<AppUser> select(String phone)
+ {
+ AppUser byId = appUserService.lambdaQuery().eq(AppUser::getPhone,phone).one();
+ if (byId==null){
+ return R.fail("搜索失败，手机号错误。");
+ }
+ return R.ok(byId);
+ }
+
+ @GetMapping("/change/bind")
+ @ApiOperation(value = "用户列表-更换绑定人", tags = {"管理后台"})
+ public R<AppUser> select(Long id,Long inviteId)
+ {
+ AppUser byId = appUserService.getById(id);
+ byId.setInviteUserId(inviteId);
+ byId.setTopInviteId(getTop(inviteId));
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
+ public Long getTop(Long inviteId){
+ AppUser byId = appUserService.getById(inviteId);
+ if (byId!=null){
+ return getTop(byId.getInviteUserId());
+ }else {
+ return inviteId;
+ }
+ }
+
+
+
+
+
@Resource
private ShopClient shopClient;
@Resource
@@ -515,6 +552,7 @@
if (lastOrder.getData()!=null){
byId.setLastOrderTime(lastOrder.getData().getCreateTime());
}
+ //消费总金额
return R.ok(byId);
}
--
Gitblit v1.7.1