From bbccdee143c85c0a5cc3522ba79445d10e4236b7 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 10:21:02 +0800
Subject: [PATCH] 用户积分统计
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 c4da661..3caa4d3 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
@@ -2,6 +2,8 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserPoint;
@@ -23,6 +25,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -164,7 +167,7 @@
public UserPointStatistics getStatistics(UserPoint userPoint) {
LoginUser loginUser = tokenService.getLoginUser();
userPoint.setAppUserId(loginUser.getUserid());
- List<UserPoint> userPointList = userPointMapper.findLatestChangeByType(userPoint);
+ List<UserPoint> userPointList = userPointMapper.findLatestChangeByType(userPoint);
Map<Integer, Integer> userBalanceMap = userPointList.stream()
.collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance));
@@ -191,4 +194,26 @@
userPointStatistics.setShopAchievementPoint(shopAchievementPoint);
return userPointStatistics;
}
+
+ @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::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;
+ }
}
--
Gitblit v1.7.1