From d6e819838bba8477029f53c68570402bf449ab8f Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期三, 18 十二月 2024 14:01:45 +0800 Subject: [PATCH] 1 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 89 insertions(+), 6 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 bc08986..61c0ede 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; @@ -12,9 +14,11 @@ import com.ruoyi.account.service.UserPointService; import com.ruoyi.account.service.VipSettingService; import com.ruoyi.account.vo.UserPointDetailVO; +import com.ruoyi.account.vo.UserPointStatistics; 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; @@ -22,14 +26,12 @@ 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; 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; /** @@ -51,6 +53,8 @@ private VipSettingService vipSettingService; @Resource private PointSettingService pointSettingService; + @Resource + private UserPointMapper userPointMapper; @Override public UserPointVO getUserPoint(Long userId) { @@ -121,8 +125,9 @@ } Integer buyPointOpen = pointSetting.getBuyPointOpen(); - List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>() - .eq(UserPoint::getAppUserId, userid)); + UserPoint userPoint = new UserPoint(); + userPoint.setAppUserId(userid); + List<UserPoint> userPointList = userPointMapper.findLatestChangeByType(userPoint); Map<Integer, Integer> userBalanceMap = userPointList.stream() .collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance)); @@ -155,4 +160,82 @@ private int getAdjustedPoint(Map<Integer, Integer> userBalanceMap, int pointTypeCode, boolean isOpen) { return isOpen ? 0 : Optional.ofNullable(userBalanceMap.get(pointTypeCode)).orElse(0); } + + @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); + } + } + + + @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())); + if (appUserList.isEmpty()){ + return page; + } + + List<Long> userIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList()); + + Page<UserPoint> userPointPage = page(page, new LambdaQueryWrapper<UserPoint>() + .in(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; + } } -- Gitblit v1.7.1