From eb428cb6839049970e67264f4eafc612e5bcaa38 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 18 三月 2025 15:14:20 +0800 Subject: [PATCH] 修改统计bug --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 49d0e31..9f91beb 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 @@ -13,6 +13,7 @@ import com.ruoyi.account.vo.UserPointDetailVO; import com.ruoyi.account.vo.UserPointStatistics; import com.ruoyi.account.vo.UserPointVO; +import com.ruoyi.account.vo.UserStatisticsDetail; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.PhoneNumberValidator; import com.ruoyi.common.core.web.page.PageInfo; @@ -23,6 +24,7 @@ import com.ruoyi.order.model.OrderGood; import com.ruoyi.other.api.domain.VipSetting; import com.ruoyi.other.api.enums.PointChangeType; +import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -33,9 +35,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -227,7 +227,7 @@ int pullNewPoint = userBalanceMap.getOrDefault(PointChangeType.PULL_NEW.getCode(), 0); int registerPoint = userBalanceMap.getOrDefault(PointChangeType.REGISTER.getCode(), 0); - // 做工积分:签到积分 + 每日分享积分 + 每日签到积分 + 每日使用时长积分 + // 做工积分:每日分享积分 + 每日签到积分 + 每日使用时长积分 int share = userBalanceMap.getOrDefault(PointChangeType.SHARE.getCode(), 0); int signIn = userBalanceMap.getOrDefault(PointChangeType.SIGN_IN.getCode(), 0); int useTime = userBalanceMap.getOrDefault(PointChangeType.USE_TIME.getCode(), 0); -- Gitblit v1.7.1