diff --git a/src/main/java/com/sqx/modules/app/dao/UserDao.java b/src/main/java/com/sqx/modules/app/dao/UserDao.java index 037fe2eb..cfc39a54 100644 --- a/src/main/java/com/sqx/modules/app/dao/UserDao.java +++ b/src/main/java/com/sqx/modules/app/dao/UserDao.java @@ -35,7 +35,7 @@ public interface UserDao extends BaseMapper { int insertUser(UserEntity userEntity); - List selectInviteUserList(String userName,String phone); + List selectInviteUserList(); int selectUserOnLineCount(String qdCode); diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 728645d4..2cc55344 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -1523,19 +1523,31 @@ public class UserServiceImpl extends ServiceImpl implements @Override public Result selectInviteUserList(Integer page, Integer limit, String userName, String phone) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if(StrUtil.isNotBlank(userName)) { + queryWrapper.like(UserEntity::getUserName, userName); + } + + if (StrUtil.isNotBlank(phone)) { + queryWrapper.like(UserEntity::getPhone, phone); + } + queryWrapper.orderByDesc(UserEntity::getCreateTime); PageHelper.startPage(page,limit); - List userEntities = baseMapper.selectInviteUserList(userName, phone); - if (!userEntities.isEmpty()) { - Set userIdList = userEntities.stream().map(UserEntity::getUserId).collect(Collectors.toSet()); + List userEntityList = list(queryWrapper); + + Map countInfoMap = baseMapper.selectInviteUserList().stream().collect(Collectors.toMap(UserEntity::getUserId, UserEntity::getCounts)); + if (!userEntityList.isEmpty()) { + Set userIdList = userEntityList.stream().map(UserEntity::getUserId).collect(Collectors.toSet()); Map infoMap = userMoneyService.list(new LambdaQueryWrapper() .in(UserMoney::getUserId, userIdList)) .stream().collect(Collectors.toMap(UserMoney::getUserId, item -> item)); - userEntities.forEach(item -> { + userEntityList.forEach(item -> { UserMoney userMoney = infoMap.get(item.getUserId()); item.setMoney(userMoney == null ? BigDecimal.ZERO : userMoney.getInviteIncomeMoney()); + item.setCounts(countInfoMap.get(item.getUserId())); }); } - return Result.success().put("data", PageUtils.page(new PageInfo<>(userEntities),true)); + return Result.success().put("data", PageUtils.page(new PageInfo<>(userEntityList),true)); } @Override diff --git a/src/main/resources/mapper/app/UserDao.xml b/src/main/resources/mapper/app/UserDao.xml index 17f4d683..7c05619b 100644 --- a/src/main/resources/mapper/app/UserDao.xml +++ b/src/main/resources/mapper/app/UserDao.xml @@ -299,22 +299,7 @@