From 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 17 一月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
index 827270a..ed7cb65 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.UserPoint;
import com.ruoyi.account.api.model.UserSignRecord;
import com.ruoyi.account.dto.SignBackRDto;
import com.ruoyi.account.service.AppUserService;
+import com.ruoyi.account.service.BalanceChangeRecordService;
import com.ruoyi.account.service.UserPointService;
import com.ruoyi.account.service.UserSignRecordService;
import com.ruoyi.common.core.domain.R;
@@ -52,6 +54,8 @@
@Resource
private UserPointService userPointService;
+ @Resource
+ private BalanceChangeRecordService balanceChangeRecordService;
@@ -83,7 +87,6 @@
}
Integer lavePoint = appUser.getLavePoint();
appUser.setTotalPoint(appUser.getTotalPoint() + signPoint);
- appUser.setTotalSignPoint(appUser.getTotalSignPoint() + signPoint);
appUser.setLavePoint(appUser.getLavePoint() + signPoint);
appUser.setAvailablePoint(appUser.getAvailablePoint() + signPoint1);
appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + signPoint1);
@@ -94,14 +97,16 @@
appUserService.updateById(appUser);
//添加积分变动记录
- UserPoint userPoint = new UserPoint();
- userPoint.setType(5);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(signPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPointService.save(userPoint);
+ if(signPoint > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(5);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(signPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPointService.save(userPoint);
+ }
//变更等级
appUserService.vipUpgrade(appUser.getId());
}
@@ -116,6 +121,17 @@
BigDecimal sum2 = appUser.getBalance().add(bigDecimalR.getData());
appUser.setBalance(sum2);
appUserService.updateById(appUser);
+ // 增加一条余额明细
+ BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
+ balanceChangeRecord.setAppUserId(appUser.getId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
+ balanceChangeRecord.setChangeType(3);
+ balanceChangeRecord.setBeforeAmount(appUser.getBalance());
+ balanceChangeRecord.setChangeAmount(bigDecimalR.getData());
+ balanceChangeRecord.setAfterAmount(appUser.getBalance().add(bigDecimalR.getData()));
+ balanceChangeRecord.setDelFlag(0);
+ balanceChangeRecord.setCreateTime(LocalDateTime.now());
+ balanceChangeRecordService.save(balanceChangeRecord);
SignBackRDto signBackRDto = new SignBackRDto();
signBackRDto.setPoint(userSignRecord.getPoint());
signBackRDto.setRedAmount(userSignRecord.getRedAmount());
--
Gitblit v1.7.1