From a338560c73d380fb9d1293c2fbeabb39669f30fe Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 06 十二月 2024 11:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 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 e3c1045..93bfcf9 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
@@ -12,12 +12,11 @@
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.feignClient.StoreClient;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import java.util.List;
@@ -25,8 +24,6 @@
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import org.springframework.web.bind.annotation.*;
/**
@@ -178,7 +175,7 @@
@ResponseBody
- @PostMapping("/recommend")
+ @GetMapping("/recommend")
@ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
public R<AppUser> recommend(){
Long userId = tokenService.getLoginUserApplet().getUserid();
@@ -219,6 +216,18 @@
user.setBottomUsers(list);
return R.ok(user);
+ }
+
+ @ResponseBody
+ @GetMapping("/change")
+ @ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
+ public R<AppUser> change(@ApiParam("换绑用户id") Long userId){
+ Long userId1 = tokenService.getLoginUserApplet().getUserid();
+ //获取绑定门店
+ AppUser user = appUserService.getById(userId1);
+ user.setInviteUserId(userId);
+ appUserService.updateById(user);
+ return R.ok();
}
@@ -281,6 +290,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