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 | 71 ++---------------------------------
1 files changed, 5 insertions(+), 66 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 5751140..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
@@ -127,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));
@@ -163,75 +165,12 @@
@Override
public UserPointStatistics getStatistics(UserPoint userPoint) {
- try {
- 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(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.groupingBy(
- UserPoint::getType,
- Collectors.summingInt(UserPoint::getBalance)
- ));
-
- int consumePoint = userBalanceMap.getOrDefault(PointChangeType.CONSUME.getCode(), 0);
- int sharePoint = userBalanceMap.getOrDefault(PointChangeType.COMMISSION_RETURN.getCode(), 0);
- int pullNewPoint = userBalanceMap.getOrDefault(PointChangeType.NEW_USER_REFERRAL.getCode(), 0);
- int registerPoint = userBalanceMap.getOrDefault(PointChangeType.REGISTRATION.getCode(), 0);
- int workPoint = userBalanceMap.getOrDefault(PointChangeType.WORK_PERFORMANCE.getCode(), 0);
- int shopAchievementPoint = userBalanceMap.getOrDefault(PointChangeType.TECHNICIAN_PERFORMANCE.getCode(), 0);
- int exchangeGoodsPoint = userBalanceMap.getOrDefault(PointChangeType.EXCHANGE_GOODS.getCode(), 0);
- int storeAchievementPoint = userBalanceMap.getOrDefault(PointChangeType.STORE_PERFORMANCE.getCode(), 0);
- int storeCommissionPoint = userBalanceMap.getOrDefault(PointChangeType.STORE_COMMISSION_RETURN.getCode(), 0);
- int transferPoint = userBalanceMap.getOrDefault(PointChangeType.TRANSFER_POINTS.getCode(), 0);
- int totalPoint = consumePoint + sharePoint + pullNewPoint + registerPoint + workPoint + shopAchievementPoint + exchangeGoodsPoint + storeAchievementPoint + storeCommissionPoint + transferPoint;
-
- UserPointStatistics userPointStatistics = new UserPointStatistics();
- userPointStatistics.setTotalPoint(totalPoint);
- userPointStatistics.setConsumePoint(consumePoint);
- userPointStatistics.setSharePoint(sharePoint);
- userPointStatistics.setPullNewPoint(pullNewPoint);
- userPointStatistics.setRegisterPoint(registerPoint);
- userPointStatistics.setWorkPoint(workPoint);
- userPointStatistics.setShopAchievementPoint(shopAchievementPoint);
-
- return userPointStatistics;
- } catch (Exception e) {
- // 记录异常日志
- log.error("获取用户点统计信息时出错", e);
- throw new RuntimeException("获取用户点统计信息时出错", e);
- }
+ 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() != 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()
- .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