From 4cac44e0c1c1c3268cf5b885a75256e57156943c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 十二月 2024 15:02:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 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 71837a9..e3c1045 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
@@ -8,6 +8,7 @@
import com.ruoyi.account.service.UserCancellationLogService;
import com.ruoyi.account.service.UserCouponService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.feignClient.StoreClient;
@@ -81,7 +82,7 @@
@ResponseBody
@PostMapping("/editAppUserById")
- public R<Void> editAppUserById(@RequestParam("appUser") AppUser appUser) {
+ public R<Void> editAppUserById(@RequestBody AppUser appUser) {
appUserService.updateById(appUser);
return R.ok();
@@ -158,7 +159,7 @@
private UserCancellationLogService userCancellationLogService;
@ResponseBody
- @PostMapping("/unregis")
+ @GetMapping("/unregis")
@ApiOperation(value = "注销", tags = {"小程序-个人中心首页-我的资料"})
public R unregis(){
Long userId = tokenService.getLoginUserApplet().getUserid();
@@ -174,6 +175,51 @@
return R.ok();
}
+
+
+ @ResponseBody
+ @PostMapping("/recommend")
+ @ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
+ public R<AppUser> recommend(){
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ //获取绑定门店
+ AppUser user = appUserService.getById(userId);
+ if (user.getShopId()!=null){
+ R<Shop> storeById = storeClient.getStoreById(user.getShopId());
+ if (storeById.getData()!=null){
+ user.setShopName(storeById.getData().getName());
+ user.setShopCover(storeById.getData().getHomePicture());
+ user.setShopAddress(storeById.getData().getAddress());
+ }
+ }
+
+ //获取绑定上级
+ if (user.getInviteUserId()!=null) {
+ AppUser byId = appUserService.getById(user.getInviteUserId());
+ user.setTopUser(byId);
+ }
+ //获取绑定下级列表
+ List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, user.getInviteUserId()).list();
+ for (AppUser appUser : list) {
+ Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getTopInviteId, 1).count();
+ Long count2 = appUserService.lambdaQuery().eq(AppUser::getVipId, 2).eq(AppUser::getTopInviteId, userId).count();
+ Long count3 = appUserService.lambdaQuery().eq(AppUser::getVipId, 3).eq(AppUser::getTopInviteId, userId).count();
+ Long count4 = appUserService.lambdaQuery().eq(AppUser::getVipId, 4).eq(AppUser::getTopInviteId, userId).count();
+ Long count5 = appUserService.lambdaQuery().eq(AppUser::getVipId, 5).eq(AppUser::getTopInviteId, userId).count();
+ Long count6 = appUserService.lambdaQuery().eq(AppUser::getVipId, 6).eq(AppUser::getTopInviteId, userId).count();
+ Long count7 = appUserService.lambdaQuery().eq(AppUser::getVipId, 7).eq(AppUser::getTopInviteId, userId).count();
+ appUser.setCount1(count1);
+ appUser.setCount2(count2);
+ appUser.setCount3(count3);
+ appUser.setCount4(count4);
+ appUser.setCount5(count5);
+ appUser.setCount6(count6);
+ appUser.setCount7(count7);
+ }
+ user.setBottomUsers(list);
+
+ return R.ok(user);
+ }
@@ -215,6 +261,17 @@
}
+ @GetMapping("/index/change")
+ @ApiOperation(value = "修改个人资料", tags = {"小程序-个人中心首页"})
+ public R<AppUser> indexchange(String avatar,String name){
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ //当前用户信息
+ AppUser user = appUserService.getById(userId);
+ user.setName(name);
+ user.setAvatar(avatar);
+ appUserService.updateById(user);
+ return R.ok();
+ }
/**
* 获取用户的祖籍列表
*/
--
Gitblit v1.7.1