From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 129 ++++++++++++++++++++++++++++++++++++------
1 files changed, 109 insertions(+), 20 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 32e001d..1c552ce 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
@@ -1,6 +1,25 @@
package com.ruoyi.account.controller;
+import java.time.LocalDateTime;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.UserCancellationLog;
+import com.ruoyi.account.service.AppUserService;
+import com.ruoyi.account.service.UserCancellationLogService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.feignClient.StoreClient;
+import org.junit.Test;
+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;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.vo.*;
@@ -27,15 +46,19 @@
@Api(tags = {"登录注册-小程序"})
@RestController
@RequestMapping("/app-user")
-public class AppUserController extends BaseController {
-
+public class AppUserController {
+
+
+
+ @Resource
+ private TokenService tokenService;
@Resource
private AppUserService appUserService;
-
-
-
-
-
+ @Resource
+ private StoreClient storeClient;
+
+
+
@ResponseBody
@PostMapping("/appletLogin")
@ApiOperation(value = "小程序一键登录")
@@ -59,17 +82,17 @@
public R getSMSCode(@RequestBody SMSCode smsCode){
return appUserService.getSMSCode(smsCode);
}
-
-
-
+
+
+
@ResponseBody
@PostMapping("/registerAccount")
@ApiOperation(value = "注册新账号")
public R<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
return appUserService.registerAccount(registerAccount);
}
-
-
+
+
@ResponseBody
@GetMapping("/getReferrer/{id}")
@ApiOperation(value = "获取推荐人信息")
@@ -82,9 +105,9 @@
phone = phone.substring(0, 3) + "****" + phone.substring(7);
return R.ok(appUser.getName() + "-" + phone);
}
-
-
-
+
+
+
@ResponseBody
@GetMapping("/getNearbyReferrer")
@ApiOperation(value = "获取附近推荐人列表")
@@ -93,10 +116,76 @@
List<NearbyReferrerVo> list = appUserService.getNearbyReferrer(nearbyReferrer);
return getDataTable(list);
}
-
-
-
-
-
+
+
+ @ResponseBody
+ @PostMapping("/info")
+ @ApiOperation(value = "我的资料", tags = {"小程序-个人中心首页-我的资料"})
+ public R<AppUser> info(){
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ AppUser user = appUserService.getById(userId);
+ return R.ok(user);
+ }
+ @Resource
+ private UserCancellationLogService userCancellationLogService;
+
+ @ResponseBody
+ @PostMapping("/unregis")
+ @ApiOperation(value = "注销", tags = {"小程序-个人中心首页-我的资料"})
+ public R unregis(){
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ AppUser user = appUserService.getById(userId);
+
+ //添加注销记录
+ UserCancellationLog userCancellationLog = new UserCancellationLog();
+ userCancellationLog.setAppUserId(user.getId());
+ userCancellationLog.setVipId(user.getVipId());
+ userCancellationLogService.save(userCancellationLog);
+
+
+ return R.ok();
+ }
+
+
+ @PostMapping("/index")
+ @ApiOperation(value = "个人中心首页", tags = {"小程序-个人中心首页"})
+ public R<AppUser> index(){
+ System.err.println("=-====");
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ //当前用户信息
+ AppUser user = appUserService.getById(userId);
+ //当前用户的推荐人信息
+ if (user.getInviteUserId()!=null){
+ AppUser inviteUser = appUserService.getById(user.getInviteUserId());
+ user.setInviteUserName(inviteUser.getName());
+ }
+ //当前绑定门店的店铺信息
+ if (user.getShopId()!=null){
+ R<Shop> storeById = storeClient.getStoreById(user.getShopId());
+ if (storeById.getData()!=null){
+ user.setShopName(storeById.getData().getName());
+ }
+ }
+ 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();
+ user.setCount1(count1);
+ user.setCount2(count2);
+ user.setCount3(count3);
+ user.setCount4(count4);
+ user.setCount5(count5);
+ user.setCount6(count6);
+ user.setCount7(count7);
+ return R.ok(user);
+
+
+ }
+
+
+
}
--
Gitblit v1.7.1