From 3c923d976c45df37ea752153e12107a3a29437e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 17:54:22 +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/controller/UserSignRecordController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 e44d0d3..733f559 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,6 +87,7 @@
}
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);
@@ -110,7 +115,22 @@
R<BigDecimal> bigDecimalR = systemConfigClient.redPackegeSet();
userSignRecord.setRedAmount(bigDecimalR.getData());
userSignRecord.setSignDay(LocalDate.now());
-
+ BigDecimal sum = appUser.getTotalRedPacketAmount().add(bigDecimalR.getData());
+ appUser.setTotalRedPacketAmount(sum);
+ 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