From cbf2486983b77a27af9968bbb362cb8d43789115 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 26 三月 2025 15:30:53 +0800
Subject: [PATCH] 修改统计bug和部分功能修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 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 9f91beb..134a7cf 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
@@ -173,12 +173,11 @@
if(point > 0){
UserPoint userPoint = new UserPoint();
userPoint.setType(12);
- userPoint.setHistoricalPoint(lavePoint1);
userPoint.setVariablePoint(point);
- userPoint.setBalance(appUserForPhoe.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUserForPhoe.getId());
userPoint.setObjectId(userid);
+ userPoint.setChangeDirection(1);
userPointService.save(userPoint);
}
@@ -191,12 +190,11 @@
if(point > 0){
UserPoint userPoint = new UserPoint();
userPoint.setType(13);
- userPoint.setHistoricalPoint(lavePoint);
userPoint.setVariablePoint(point);
- userPoint.setBalance(appUser.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUser.getId());
userPoint.setObjectId(appUserForPhoe.getId());
+ userPoint.setChangeDirection(-1);
userPointService.save(userPoint);
}
return R.ok();
@@ -208,12 +206,7 @@
List<UserPoint> userPointList = this.baseMapper.selectUserPoint(userPoint);
userPointList.forEach(item -> {
- int i = item.getHistoricalPoint() - item.getBalance();
- if (i>0){
- item.setVariablePoint(item.getVariablePoint() * -1);
- }else {
- item.setVariablePoint(item.getVariablePoint());
- }
+ item.setVariablePoint(item.getVariablePoint() * item.getChangeDirection());
});
Map<Integer, Integer> userBalanceMap = userPointList.stream()
@@ -252,12 +245,7 @@
public IPage<UserPoint> getUserPointPage(Page<UserPoint> page, UserPoint userPoint) {
IPage<UserPoint> userPointIPage = this.baseMapper.queryUserPointPage(page, userPoint);
userPointIPage.getRecords().forEach(item -> {
- int i = item.getHistoricalPoint() - item.getBalance();
- if (i>0){
- item.setVariablePoint(item.getVariablePoint() * -1);
- }else {
- item.setVariablePoint(item.getVariablePoint());
- }
+ item.setVariablePoint(item.getVariablePoint() * item.getChangeDirection());
});
return userPointIPage;
}
--
Gitblit v1.7.1