From 5452b71b68e30abed5bd66e3b3d246c7ff008ec0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 一月 2025 10:12:54 +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 | 5 +++++
1 files changed, 5 insertions(+), 0 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 063597c..b56c623 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
@@ -97,6 +97,11 @@
userPointDetailVO.setVariablePoint(p.getVariablePoint());
String format = p.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
userPointDetailVO.setCreateTime(format);
+ Integer historicalPoint = p.getHistoricalPoint();
+ Integer balance = p.getBalance();
+ if (historicalPoint != null && balance != null) {
+ userPointDetailVO.setFlag(historicalPoint > balance ? 2 : 1);
+ }
return userPointDetailVO;
}).collect(Collectors.toList());
PageInfo<UserPointDetailVO> pageInfo1 = new PageInfo<>(pageCurr, pageSize);
--
Gitblit v1.7.1