From 004ef58935119a07d58a3229c2422f2b8bfbeb30 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 16:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 3775d83..db675e1 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
@@ -55,8 +55,7 @@
@Override
public UserPointVO getUserPoint(Long userId) {
AppUser appUser = appUserService.getById(userId);
- List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
- .eq(UserPoint::getAppUserId, userId));
+ List<UserPoint> userPointList = this.baseMapper.findLatestUserPointByTypeForUser(userId);
Map<Integer, Integer> userBalanceMap = userPointList.stream()
.collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance));
@@ -149,6 +148,7 @@
}
appUserForPhoe.setLavePoint(appUserForPhoe.getLavePoint() + point.intValue());
+ appUserForPhoe.setTotalPoint(appUserForPhoe.getTotalPoint() + point.intValue());
appUserService.updateById(appUserForPhoe);
log.info("积分转赠完成，用户ID: {}, 新积分: {}", appUserForPhoe.getId(), appUserForPhoe.getLavePoint());
--
Gitblit v1.7.1