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

@@ -23,8 +23,9 @@
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BaseTable;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -32,6 +33,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -60,7 +62,7 @@
   @ResponseBody
   @PostMapping("/appletLogin")
   @ApiOperation(value = "小程序一键登录")
   public AjaxResult<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
   public R<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
      return appUserService.appletLogin(appletLogin);
   }
   
@@ -68,7 +70,7 @@
   @ResponseBody
   @PostMapping("/mobileLogin")
   @ApiOperation(value = "手机号登录")
   public AjaxResult<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
   public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
      return appUserService.mobileLogin(mobileLogin);
   }
   
@@ -77,7 +79,7 @@
   @ResponseBody
   @PostMapping("/getSMSCode")
   @ApiOperation(value = "获取短信验证码")
   public AjaxResult getSMSCode(@RequestBody SMSCode smsCode){
   public R getSMSCode(@RequestBody SMSCode smsCode){
      return appUserService.getSMSCode(smsCode);
   }

@@ -86,7 +88,7 @@
   @ResponseBody
   @PostMapping("/registerAccount")
   @ApiOperation(value = "注册新账号")
   public AjaxResult<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
   public R<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
      return appUserService.registerAccount(registerAccount);
   }

@@ -97,11 +99,11 @@
   @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "推荐人id", required = true, dataType = "long")
   })
   public AjaxResult<String> getReferrer(@PathVariable("id") Long id){
   public R<String> getReferrer(@PathVariable("id") Long id){
      AppUser appUser = appUserService.getById(id);
      String phone = appUser.getPhone();
      phone = phone.substring(0, 3) + "****" + phone.substring(7);
      return AjaxResult.success(appUser.getName() + "-" + phone);
      return R.ok(appUser.getName() + "-" + phone);
   }


@@ -109,9 +111,10 @@
   @ResponseBody
   @GetMapping("/getNearbyReferrer")
   @ApiOperation(value = "获取附近推荐人列表")
   public AjaxResult<BaseTable<NearbyReferrerVo>> getNearbyReferrer(NearbyReferrer nearbyReferrer){
      BaseTable<NearbyReferrerVo> baseTable = appUserService.getNearbyReferrer(nearbyReferrer);
      return AjaxResult.success(baseTable);
   public TableDataInfo<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer){
      startPage();
      List<NearbyReferrerVo> list = appUserService.getNearbyReferrer(nearbyReferrer);
      return getDataTable(list);
   }


@@ -119,7 +122,7 @@
   @PostMapping("/info")
   @ApiOperation(value = "我的资料", tags = {"小程序-个人中心首页-我的资料"})
   public R<AppUser> info(){
      Long userId = tokenService.getLoginUserApplet().getUserId();
      Long userId = tokenService.getLoginUserApplet().getUserid();
      AppUser user = appUserService.getById(userId);
      return R.ok(user);
   }
@@ -130,7 +133,7 @@
   @PostMapping("/unregis")
   @ApiOperation(value = "注销", tags = {"小程序-个人中心首页-我的资料"})
   public R unregis(){
      Long userId = tokenService.getLoginUserApplet().getUserId();
      Long userId = tokenService.getLoginUserApplet().getUserid();
      AppUser user = appUserService.getById(userId);

      //添加注销记录
@@ -148,7 +151,7 @@
   @ApiOperation(value = "个人中心首页", tags = {"小程序-个人中心首页"})
   public R<AppUser> index(){
        System.err.println("=-====");
        Long userId = tokenService.getLoginUserApplet().getUserId();
        Long userId = tokenService.getLoginUserApplet().getUserid();
      //当前用户信息
      AppUser user = appUserService.getById(userId);
      //当前用户的推荐人信息
@@ -163,7 +166,7 @@
            user.setShopName(storeById.getData().getName());
         }
      }
      Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getTopInviteId, userId).count();
      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();