Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-16 1d64c14b6b0e9bbcae2736f83c0a498b5083d1d6

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

@@ -164,20 +164,20 @@
    @Override
    public UserPointStatistics getStatistics(UserPoint userPoint) {

        List<Long> userIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(userPoint.getUserName())) {
            userIds = appUserService.listObjs(new LambdaQueryWrapper<AppUser>()
        if (StringUtils.isNotEmpty(userPoint.getUserName()) || StringUtils.isNotEmpty(userPoint.getPhone())) {
            List<Long> userIds = appUserService.listObjs(new LambdaQueryWrapper<AppUser>()
                            .select(AppUser::getId)
                            .like(AppUser::getName, userPoint.getUserName()))
                            .like(StringUtils.isNotEmpty(userPoint.getUserName()),AppUser::getName, userPoint.getUserName())
                            .like(StringUtils.isNotEmpty(userPoint.getPhone()),AppUser::getPhone, userPoint.getPhone()))
                    .stream()
                    .map(appUserId -> (Long) appUserId)
                    .collect(Collectors.toList());
            userPoint.setUserIds(userIds);
        }

        List<UserPoint> userPointList = userPointMapper.findLatestChangeByType(userPoint);
        Map<Integer, Integer> userBalanceMap = userPointList.stream()
                .collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance));



        Integer consumePoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.CONSUME.getCode())).orElse(0);
@@ -213,8 +213,8 @@

        Page<UserPoint> userPointPage = page(page, new LambdaQueryWrapper<UserPoint>()
                .in(!CollectionUtils.isEmpty(userIds), UserPoint::getAppUserId, userIds)
                .eq(UserPoint::getType, userPoint.getType())
                .between(UserPoint::getCreateTime, userPoint.getStartTime(), userPoint.getEndTime())
                .eq(userPoint.getType() != null, UserPoint::getType, userPoint.getType())
                .between( userPoint.getStartTime()!= null && userPoint.getEndTime() !=null,UserPoint::getCreateTime, userPoint.getStartTime(), userPoint.getEndTime())
                .orderByDesc(UserPoint::getCreateTime));

        userPointPage.getRecords().forEach(userPoint1 -> appUserList.stream()