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

无关风月

2025-01-15 d20a4aade6f9ed5111b496ac9abdff9f05f81535

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java

@@ -179,7 +179,8 @@
      }
      
      //查询用户是否注册，没有注册则跳转到注册页面
      AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, mobileLogin.getPhone()).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
      AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, mobileLogin.getPhone())
            .ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
      if(null == appUser){
         LoginVo loginVo = new LoginVo();
         loginVo.setSkipPage(2);
@@ -200,8 +201,7 @@
      loginUser.setUsername(appUser.getName());
      Map<String, Object> tokenApplet = tokenService.createTokenApplet(loginUser);
      loginVo.setToken(tokenApplet.get("access_token").toString());
         loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString()));
		
      loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString()));
      appUser.setLastLoginTime(LocalDateTime.now());
      this.updateById(appUser);
      return R.ok(loginVo);
@@ -608,7 +608,85 @@
      }
   }
   
	
   /**
    * 处理会员降级
    * @param appUserId
    */
   @Override
   public void vipDemotion(Long appUserId) {
      AppUser appUser = this.getById(appUserId);
      Integer vipId = appUser.getVipId();
      //黄金会员
      VipSetting vipSetting2 = vipSettingClient.getVipSetting(2).getData();
      //消费积分满足升级
      if(1 == vipSetting2.getVipLevelUpShopRole() && appUser.getShopPoint() >= vipSetting2.getVipLevelUpShop() && appUser.getVipId() > 2){
         appUser.setVipId(2);
         this.updateById(appUser);
         //添加等级变化记录
         UserChangeLog userChangeLog = new UserChangeLog();
         userChangeLog.setDelFlag(0);
         userChangeLog.setCreateTime(LocalDateTime.now());
         userChangeLog.setAppUserId(appUser.getId());
         userChangeLog.setBeforeVipId(vipId);
         userChangeLog.setAfterVipId(appUser.getVipId());
         userChangeLog.setChangeType(0);
         userChangeLogService.save(userChangeLog);
         return;
      }
      //返佣积分满足升级
      if(1 == vipSetting2.getVipLevelUpShareRole() && appUser.getSharePoint() >= vipSetting2.getVipLevelUpShare() && appUser.getVipId() > 2){
         appUser.setVipId(2);
         this.updateById(appUser);
         //添加等级变化记录
         UserChangeLog userChangeLog = new UserChangeLog();
         userChangeLog.setDelFlag(0);
         userChangeLog.setCreateTime(LocalDateTime.now());
         userChangeLog.setAppUserId(appUser.getId());
         userChangeLog.setBeforeVipId(vipId);
         userChangeLog.setAfterVipId(appUser.getVipId());
         userChangeLog.setChangeType(0);
         userChangeLogService.save(userChangeLog);
         return;
      }
      //下级人数满足升级
      Integer vipLevelUpNumRole = vipSetting2.getVipLevelUpNumRole();
      Integer vipDirectNum = vipSetting2.getVipDirectNum();
      Integer vipTeamNum = vipSetting2.getVipTeamNum();
      if(1 == vipLevelUpNumRole && appUser.getVipId() > 2){
         //查询直推用户达到X人或者团队人数达到X人后，可升级
         //直推用户数
         long count = this.count(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1).eq(AppUser::getInviteUserId, appUserId));
         //团队用户数
         List<AppUser> subordinate = getSubordinate(appUserId);
         if(vipDirectNum <= count || vipTeamNum <= subordinate.size()){
            appUser.setVipId(2);
            this.updateById(appUser);
            //添加等级变化记录
            UserChangeLog userChangeLog = new UserChangeLog();
            userChangeLog.setDelFlag(0);
            userChangeLog.setCreateTime(LocalDateTime.now());
            userChangeLog.setAppUserId(appUser.getId());
            userChangeLog.setBeforeVipId(vipId);
            userChangeLog.setAfterVipId(appUser.getVipId());
            userChangeLog.setChangeType(0);
            userChangeLogService.save(userChangeLog);
            return;
         }
      }
      if(appUser.getVipId() > 2){
         appUser.setVipId(1);
         this.updateById(appUser);
         //添加等级变化记录
         UserChangeLog userChangeLog = new UserChangeLog();
         userChangeLog.setDelFlag(0);
         userChangeLog.setCreateTime(LocalDateTime.now());
         userChangeLog.setAppUserId(appUser.getId());
         userChangeLog.setBeforeVipId(vipId);
         userChangeLog.setAfterVipId(appUser.getVipId());
         userChangeLog.setChangeType(0);
         userChangeLogService.save(userChangeLog);
      }
   }
   
   /**
    * 递归查询顶级推广人