From 91e9c006a2ce431a5916b137974bd004622eb9fa Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 09 四月 2025 20:15:45 +0800
Subject: [PATCH] 用户端代码调整测试
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 55 +++++++++++++++++++++++++++----------------------------
1 files changed, 27 insertions(+), 28 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 2aff81d..2142a97 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
@@ -50,18 +50,14 @@
@Override
public UserPointVO getUserPoint(Long userId) {
AppUser appUser = appUserService.getById(userId);
- int totalPoint = 0;
- int sharePoint = 0;
- int shopAchievementPoint = 0;
- int shopSharePoint = 0;
UserPointVO userPointVO = new UserPointVO();
- userPointVO.setTotalPoint(appUser.getTotalPoint() + totalPoint);
+ userPointVO.setTotalPoint(appUser.getUserTotalPoint() );
userPointVO.setConsumePoint(appUser.getAvailablePoint());
- userPointVO.setShopPoint(appUser.getShopPoint());
- userPointVO.setSharePoint(appUser.getSharePoint() + sharePoint);
- userPointVO.setPullNewPoint(appUser.getTotalInvitePoint());
- userPointVO.setShopAchievementPoint(appUser.getShopAchievementPoint() + shopAchievementPoint);
- userPointVO.setShopSharePoint(appUser.getShopSharePoint() + shopSharePoint);
+ userPointVO.setRechargePoint(appUser.getRechargePoint());
+ userPointVO.setCancelPoint(appUser.getCancelPoint());
+ userPointVO.setExpendPoint(appUser.getExchangePoint());
+ userPointVO.setTransferableInPoint(appUser.getTransferableInPoint());
+ userPointVO.setTransferableOutPoint(appUser.getTransferableOutPoint());
return userPointVO;
}
@@ -107,10 +103,8 @@
if (appUser == null) {
return R.fail("用户未找到");
}
- // 可转赠积分总数
- Integer transferablePoint = appUser.getTransferablePoint();
- if (point > transferablePoint) {
- return R.fail("可转赠积分不足");
+ if (appUser.getAvailablePoint() < point) {
+ return R.fail("用户可用积分不足");
}
AppUser appUserForPhoe = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
@@ -124,38 +118,43 @@
if(appUserForPhoe.getId().equals(userid)){
return R.fail("不能转增给自己");
}
- Integer lavePoint1 = appUserForPhoe.getLavePoint();
- appUserForPhoe.setLavePoint(appUserForPhoe.getLavePoint() + point);
- appUserForPhoe.setTotalPoint(appUserForPhoe.getTotalPoint() + point);
- appUserForPhoe.setTransferablePoint(transferablePoint + point);
- appUserForPhoe.setAvailablePoint(appUserForPhoe.getAvailablePoint() + point);
- appUserForPhoe.setTotalAvailablePoint(appUserForPhoe.getTotalAvailablePoint() + point);
+
+ Integer historicalPoint = appUserForPhoe.getAvailablePoint();//历史积分
+ Integer balance = historicalPoint +point;//变动后积分
+
+ appUserForPhoe.setAvailablePoint(balance);//可用积分增加
+ appUserForPhoe.setTotalPoint(appUserForPhoe.getUserTotalPoint() + point);//总积分增加
+ appUserForPhoe.setTransferableInPoint(appUserForPhoe.getTransferableInPoint() + point);//转入积分增加
+
appUserService.updateById(appUserForPhoe);
//构建积分流水记录
if(point > 0){
+ //转入用户
UserPoint userPoint = new UserPoint();
userPoint.setType(12);
- userPoint.setHistoricalPoint(lavePoint1);
+ userPoint.setHistoricalPoint(historicalPoint);
userPoint.setVariablePoint(point);
- userPoint.setBalance(appUserForPhoe.getLavePoint());
+ userPoint.setBalance(balance);
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUserForPhoe.getId());
userPoint.setObjectId(userid);
userPointService.save(userPoint);
}
- Integer lavePoint = appUser.getLavePoint();
- appUser.setLavePoint(appUser.getLavePoint() - point);
- appUser.setTransferablePoint(appUser.getTransferablePoint() - point);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - point);
+ Integer historicalPoint2 = appUserForPhoe.getAvailablePoint();//历史积分
+ Integer balance2 = historicalPoint - point;//变动后积分
+
+ appUser.setAvailablePoint(balance);//可用积分减少
+ appUser.setTransferableOutPoint(appUserForPhoe.getTransferableOutPoint() + point);//转出积分增加
+
appUserService.updateById(appUser);
//构建积分流水记录
if(point > 0){
UserPoint userPoint = new UserPoint();
userPoint.setType(13);
- userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setHistoricalPoint(historicalPoint2);
userPoint.setVariablePoint(point);
- userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setBalance(balance2);
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUser.getId());
userPoint.setObjectId(appUserForPhoe.getId());
--
Gitblit v1.7.1