Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-29 d2542a6123fa6834e01ed3af23c7ba0a02696bc6

 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,12 +46,16 @@
@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;
   
   
   
@@ -95,6 +118,72 @@
   }
   
   
   @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);


   }