From aac9fe67d35f98411d0e580ae07b3c10b9306245 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 18 十二月 2024 15:22:32 +0800 Subject: [PATCH] 合并代码 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 42 +++++++----------------------------------- 1 files changed, 7 insertions(+), 35 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java index 590c636..056f483 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java @@ -18,6 +18,7 @@ import com.ruoyi.account.vo.UserPointVO; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.PhoneNumberValidator; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.api.domain.PointSetting; import com.ruoyi.other.api.domain.VipSetting; @@ -30,10 +31,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -129,7 +127,9 @@ UserPoint userPoint = new UserPoint(); userPoint.setAppUserId(userid); - List<UserPoint> userPointList = userPointMapper.findLatestChangeByType(userPoint); +// List<UserPoint> userPointList = userPointMapper.indLatestChangeByType(userPoint); + // TODO 完善 + List<UserPoint> userPointList = new ArrayList<>(); Map<Integer, Integer> userBalanceMap = userPointList.stream() .collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance)); @@ -165,40 +165,12 @@ @Override public UserPointStatistics getStatistics(UserPoint userPoint) { - List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>() - .eq(AppUser::getPhone, userPoint.getPhone()) - .like(AppUser::getName, userPoint.getUserName())); - List<Long> userIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList()); - - list(new LambdaQueryWrapper<UserPoint>() - .in(!CollectionUtils.isEmpty(userIds), UserPoint::getAppUserId, userIds) - .eq(UserPoint::getType, userPoint.getType()) - .between(UserPoint::getCreateTime, userPoint.getStartTime(), userPoint.getEndTime())); - - return null; } + @Override public IPage<UserPoint> getUserPointPage(Page<UserPoint> page, UserPoint userPoint) { - List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>() - .eq(AppUser::getPhone, userPoint.getPhone()) - .like(AppUser::getName, userPoint.getUserName())); - List<Long> userIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList()); - - Page<UserPoint> userPointPage = page(page, new LambdaQueryWrapper<UserPoint>() - .in(!CollectionUtils.isEmpty(userIds), UserPoint::getAppUserId, userIds) - .eq(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() - .filter(appUser -> appUser.getId().equals(userPoint1.getAppUserId())) - .findFirst().ifPresent(appUser -> { - userPoint1.setUserName(appUser.getName()); - userPoint1.setPhone(appUser.getPhone()); - })); - return userPointPage; + return this.baseMapper.queryUserPointPage(page, userPoint); } } -- Gitblit v1.7.1