From db446eb947ee5851fdbd1f16c4cc360b4e32b95a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 11:22:44 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 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..39c2e17 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;
/**
@@ -165,18 +163,45 @@
@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()));
+ List<Long> userIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(userPoint.getUserName())) {
+ userIds = appUserService.listObjs(new LambdaQueryWrapper<AppUser>()
+ .select(AppUser::getId)
+ .like(AppUser::getName, userPoint.getUserName()))
+ .stream()
+ .map(appUserId -> (Long) appUserId)
+ .collect(Collectors.toList());
+ }
+
+ List<UserPoint> userPointList = userPointMapper.findLatestChangeByType(userPoint);
+ Map<Integer, Integer> userBalanceMap = userPointList.stream()
+ .collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance));
- return null;
+
+ Integer consumePoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.CONSUME.getCode())).orElse(0);
+ Integer sharePoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.COMMISSION_RETURN.getCode())).orElse(0);
+ Integer pullNewPoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.NEW_USER_REFERRAL.getCode())).orElse(0);
+ Integer registerPoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.REGISTRATION.getCode())).orElse(0);
+ Integer workPoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.WORK_PERFORMANCE.getCode())).orElse(0);
+ Integer shopAchievementPoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.TECHNICIAN_PERFORMANCE.getCode())).orElse(0);
+ Integer exchangeGoodsPoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.EXCHANGE_GOODS.getCode())).orElse(0);
+ Integer storeAchievementPoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.STORE_PERFORMANCE.getCode())).orElse(0);
+ Integer storeCommissionPoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.STORE_COMMISSION_RETURN.getCode())).orElse(0);
+ Integer transferPoint = Optional.ofNullable(userBalanceMap.get(PointChangeType.TRANSFER_POINTS.getCode())).orElse(0);
+ Integer 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;
}
@Override
@@ -189,8 +214,7 @@
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())
+ .between(UserPoint::getCreateTime, userPoint.getStartTime(), userPoint.getEndTime())
.orderByDesc(UserPoint::getCreateTime));
userPointPage.getRecords().forEach(userPoint1 -> appUserList.stream()
--
Gitblit v1.7.1