Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

puzhibing

2024-12-09 609d91e1e62b1e8932b34b15b09baf02e7f09a93

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -8,15 +8,15 @@
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;
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;
@@ -24,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.*;

/**
@@ -158,7 +156,7 @@
   private UserCancellationLogService userCancellationLogService;

   @ResponseBody
   @PostMapping("/unregis")
   @GetMapping("/unregis")
   @ApiOperation(value = "注销", tags = {"小程序-个人中心首页-我的资料"})
   public R unregis(){
      Long userId = tokenService.getLoginUserApplet().getUserid();
@@ -174,6 +172,67 @@
      return R.ok();
   }



   @ResponseBody
   @GetMapping("/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);
   }

   @ResponseBody
   @GetMapping("/change")
   @ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
   public R<AppUser> change(@ApiParam("换绑用户手机号") String phone){
      Long userId1 = tokenService.getLoginUserApplet().getUserid();
        AppUser byId = appUserService.getById(userId1);
        //获取绑定门店
      AppUser user = appUserService.lambdaQuery().eq(AppUser::getPhone,phone).one();
      if (user==null){
         return R.fail("当前手机号未注册");
      }
        byId.setInviteUserId(user.getId());
      appUserService.updateById(byId);
      return R.ok();
   }



@@ -215,6 +274,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();
   }
   /**
    * 获取用户的祖籍列表
    */
@@ -224,6 +294,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);
   }



}