From 0f7c14b0e1048ac5284193f362ba10ae0791ffde Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 27 三月 2025 09:16:51 +0800
Subject: [PATCH] bug修改

---
 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
index 34dc49e..0e8dbff 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
@@ -1,46 +1,38 @@
 package com.xinquan.user.service.impl;
 
+
+
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xinquan.common.core.constant.Constants;
 import com.xinquan.common.core.constant.SecurityConstants;
 import com.xinquan.common.core.domain.R;
-import com.xinquan.common.core.enums.AnswerTagEnum;
 import com.xinquan.common.core.enums.AppUserStatusEnum;
 import com.xinquan.common.core.enums.DisabledEnum;
 import com.xinquan.common.core.enums.TreeLevelEnum;
 import com.xinquan.common.core.exception.ServiceException;
 import com.xinquan.common.core.utils.page.BeanUtils;
 import com.xinquan.common.core.utils.page.CollUtils;
+import com.xinquan.common.core.web.page.PageInfo;
 import com.xinquan.common.security.service.TokenService;
 import com.xinquan.common.security.utils.SecurityUtils;
 import com.xinquan.meditation.api.feign.RemoteMeditationService;
 import com.xinquan.system.api.RemoteUserService;
-import com.xinquan.system.api.domain.SysUser;
+import com.xinquan.system.api.domain.*;
+import com.xinquan.system.api.domain.vo.AppUserVO;
+import com.xinquan.system.api.domain.vo.InviteRankListVO;
 import com.xinquan.system.api.feignClient.SysUserClient;
 import com.xinquan.system.api.model.*;
-import com.xinquan.system.api.domain.AppUser;
 import com.xinquan.user.api.domain.dto.AppUserDTO;
-import com.xinquan.system.api.domain.AppUserQuestion;
-import com.xinquan.system.api.domain.AppUserTree;
-import com.xinquan.system.api.domain.Tag;
 import com.xinquan.user.domain.dto.UserAnswerDTO;
-import com.xinquan.system.api.domain.vo.AppUserVO;
 import com.xinquan.user.domain.vo.TagVO;
 import com.xinquan.user.mapper.AppUserMapper;
 import com.xinquan.user.service.AppUserQuestionService;
 import com.xinquan.user.service.AppUserService;
 import com.xinquan.user.service.AppUserTreeService;
 import com.xinquan.user.service.TagService;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +40,14 @@
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -81,6 +81,8 @@
             Optional<AppUser> one = this.lambdaQuery()
                     .ne(AppUser::getUserStatus,3)
                     .eq(AppUser::getDevice, device)
+                    .isNull(AppUser::getWxOpenId)
+                    .isNull(AppUser::getAppleId)
                     .isNull(AppUser::getCellPhone).oneOpt();
             Optional<AppUser> appUser = this.lambdaQuery()
                     .ne(AppUser::getUserStatus,3)
@@ -837,4 +839,15 @@
         AppUser appUser = this.getById(userId);
         return BeanUtils.copyBean(appUser, AppUserVO.class);
     }
+
+    @Override
+    public List<InviteRankListVO> inviteRankList(Integer pageCurr,Integer pageSize) {
+        List<InviteRankListVO> list = this.baseMapper.inviteRankList(pageCurr,pageSize);
+        return list;
+    }
+    @Override
+    public List<InviteRankListVO> inviteRankListNolimit() {
+        List<InviteRankListVO> list = this.baseMapper.inviteRankListNolimit();
+        return list;
+    }
 }

--
Gitblit v1.7.1