From cd2781c1edd9b8b9fd3fd8b6365a65c07adcb109 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 02 一月 2025 16:42:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 100a04a..15e3ad8 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
@@ -62,7 +62,7 @@
UserPointVO userPointVO = new UserPointVO();
userPointVO.setTotalPoint(appUser.getTotalPoint());
- userPointVO.setConsumePoint(appUser.getLavePoint());
+ userPointVO.setConsumePoint(appUser.getAvailablePoint());
userPointVO.setShopPoint(appUser.getShopPoint());
userPointVO.setSharePoint(appUser.getSharePoint());
userPointVO.setPullNewPoint(appUser.getTotalInvitePoint());
@@ -77,7 +77,7 @@
List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
.between(startTime != null, UserPoint::getCreateTime, startTime, endTime)
.eq(type != null, UserPoint::getType, type)
- .eq(UserPoint::getAppUserId, userId));
+ .eq(UserPoint::getAppUserId, userId).orderByDesc(UserPoint::getCreateTime));
if (CollectionUtil.isNotEmpty(userPointList)) {
return userPointList.stream().map(p -> {
UserPointDetailVO userPointDetailVO = new UserPointDetailVO();
--
Gitblit v1.7.1