From 0d87c9ac50ca1c48a39f3024e5153e594ad882de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Fri, 10 Jan 2025 16:08:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=94=A8=E6=88=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9C=AA=E8=AE=A4=E8=AF=81=E3=80=81=E6=96=B0=E4=BA=BA?= =?UTF-8?q?=E3=80=81=E8=80=81=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/service/UserInfoService.java | 1 + .../app/service/impl/UserInfoServiceImpl.java | 30 +++++++++++++++++-- .../service/impl/InviteServiceImpl.java | 9 +++--- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/UserInfoService.java b/src/main/java/com/sqx/modules/app/service/UserInfoService.java index 9d0c67a8..c50458ce 100644 --- a/src/main/java/com/sqx/modules/app/service/UserInfoService.java +++ b/src/main/java/com/sqx/modules/app/service/UserInfoService.java @@ -28,4 +28,5 @@ public interface UserInfoService extends IService { Integer countCertCount(String name, String idNum, String accountNo, String mobile); + int getAuthUserTag(long userId); } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserInfoServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserInfoServiceImpl.java index 2c79f391..c3cb2916 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserInfoServiceImpl.java @@ -1,12 +1,14 @@ package com.sqx.modules.app.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.modules.app.entity.UserInfo; import com.sqx.modules.app.mapper.UserInfoMapper; import com.sqx.modules.app.service.UserInfoService; import org.springframework.stereotype.Service; +import java.util.Comparator; import java.util.List; /** @@ -46,8 +48,8 @@ public class UserInfoServiceImpl extends ServiceImpl @Override public List getUsersByNameAndCertNo(String certName, String certNo) { List userIds = baseMapper.selectList(new LambdaQueryWrapper() - .eq(UserInfo::getCertName,certName) - .eq(UserInfo::getCertNo,certNo) + .eq(UserInfo::getCertName, certName) + .eq(UserInfo::getCertNo, certNo) .select(UserInfo::getUserId) ); return userIds; @@ -72,6 +74,30 @@ public class UserInfoServiceImpl extends ServiceImpl .eq(UserInfo::getMobile, mobile) ); } + + /** + * 获取用户认证标签 + * @param userId 用户id + * @return 0-未认证，1-新用户，2-老用户 + */ + @Override + public int getAuthUserTag(long userId) { + UserInfo userInfo = baseMapper.selectById(userId); + if (userInfo == null) { + // 未认证 + return 0; + } + String certNo = userInfo.getCertNo(); + List authUserlist = baseMapper.selectList(Wrappers.lambdaQuery().eq(UserInfo::getCertNo, certNo)); + // 同身份证号第一个认证用户 + UserInfo firstAuth = authUserlist.stream().sorted(Comparator.comparingLong(UserInfo::getId)).findFirst().get(); + if (firstAuth.getUserId() == userId) { + // 新用户 + return 1; + } + // 老用户 + return 2; + } } diff --git a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java index 7d51a06d..87916fa8 100644 --- a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java +++ b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java @@ -3,10 +3,8 @@ package com.sqx.modules.invite.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -30,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -64,6 +61,8 @@ public class InviteServiceImpl extends ServiceImpl implements private SysUserService sysUserService; @Autowired private InviteAchievementService inviteAchievementService; + @Autowired + private UserInfoService userInfoService; private final SysUserMoneyDetailsService sysUserMoneyDetailsService; public InviteServiceImpl(SysUserMoneyDetailsService sysUserMoneyDetailsService) { @@ -96,6 +95,7 @@ public class InviteServiceImpl extends ServiceImpl implements } List userIds = list.stream().map(UserEntity::getUserId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.ge(InviteAchievement::getCount, 3); queryWrapper1.eq(InviteAchievement::getUserId, userId); @@ -110,7 +110,8 @@ public class InviteServiceImpl extends ServiceImpl implements item.put("avatar", entity.getAvatar()); item.put("userName", entity.getUserName()); item.put("recordNum", achievementUserIds.contains(entity.getUserId()) ? 1 : 0); - + int userTag = userInfoService.getAuthUserTag(entity.getUserId()); + item.put("userTag", userTag); jsonList.add(item); }