邀请用户列表增加字段,显示未认证、新人、老人
This commit is contained in:
@@ -28,4 +28,5 @@ public interface UserInfoService extends IService<UserInfo> {
|
|||||||
|
|
||||||
Integer countCertCount(String name, String idNum, String accountNo, String mobile);
|
Integer countCertCount(String name, String idNum, String accountNo, String mobile);
|
||||||
|
|
||||||
|
int getAuthUserTag(long userId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
package com.sqx.modules.app.service.impl;
|
package com.sqx.modules.app.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.sqx.modules.app.entity.UserInfo;
|
import com.sqx.modules.app.entity.UserInfo;
|
||||||
import com.sqx.modules.app.mapper.UserInfoMapper;
|
import com.sqx.modules.app.mapper.UserInfoMapper;
|
||||||
import com.sqx.modules.app.service.UserInfoService;
|
import com.sqx.modules.app.service.UserInfoService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -72,6 +74,30 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
|
|||||||
.eq(UserInfo::getMobile, mobile)
|
.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<UserInfo> authUserlist = baseMapper.selectList(Wrappers.<UserInfo>lambdaQuery().eq(UserInfo::getCertNo, certNo));
|
||||||
|
// 同身份证号第一个认证用户
|
||||||
|
UserInfo firstAuth = authUserlist.stream().sorted(Comparator.comparingLong(UserInfo::getId)).findFirst().get();
|
||||||
|
if (firstAuth.getUserId() == userId) {
|
||||||
|
// 新用户
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
// 老用户
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,8 @@ package com.sqx.modules.invite.service.impl;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
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.StringUtils;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
@@ -30,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.RoundingMode;
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -64,6 +61,8 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
|
|||||||
private SysUserService sysUserService;
|
private SysUserService sysUserService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private InviteAchievementService inviteAchievementService;
|
private InviteAchievementService inviteAchievementService;
|
||||||
|
@Autowired
|
||||||
|
private UserInfoService userInfoService;
|
||||||
private final SysUserMoneyDetailsService sysUserMoneyDetailsService;
|
private final SysUserMoneyDetailsService sysUserMoneyDetailsService;
|
||||||
|
|
||||||
public InviteServiceImpl(SysUserMoneyDetailsService sysUserMoneyDetailsService) {
|
public InviteServiceImpl(SysUserMoneyDetailsService sysUserMoneyDetailsService) {
|
||||||
@@ -96,6 +95,7 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
List<Long> userIds = list.stream().map(UserEntity::getUserId).collect(Collectors.toList());
|
List<Long> userIds = list.stream().map(UserEntity::getUserId).collect(Collectors.toList());
|
||||||
|
|
||||||
LambdaQueryWrapper<InviteAchievement> queryWrapper1 = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<InviteAchievement> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||||
queryWrapper1.ge(InviteAchievement::getCount, 3);
|
queryWrapper1.ge(InviteAchievement::getCount, 3);
|
||||||
queryWrapper1.eq(InviteAchievement::getUserId, userId);
|
queryWrapper1.eq(InviteAchievement::getUserId, userId);
|
||||||
@@ -110,7 +110,8 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
|
|||||||
item.put("avatar", entity.getAvatar());
|
item.put("avatar", entity.getAvatar());
|
||||||
item.put("userName", entity.getUserName());
|
item.put("userName", entity.getUserName());
|
||||||
item.put("recordNum", achievementUserIds.contains(entity.getUserId()) ? 1 : 0);
|
item.put("recordNum", achievementUserIds.contains(entity.getUserId()) ? 1 : 0);
|
||||||
|
int userTag = userInfoService.getAuthUserTag(entity.getUserId());
|
||||||
|
item.put("userTag", userTag);
|
||||||
jsonList.add(item);
|
jsonList.add(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user