From e0623f1a914ecbc99d5926c0df3cf26032c02499 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 17:11:50 +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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 70c79b6..2b2891c 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
@@ -71,14 +71,17 @@
userSignRecord.setPoint(pointSetting.getSignPoint());
int signPoint = pointSetting.getSignPoint();
if(signPoint > 0){
- int signPoint1 = signPoint;
+ int signPoint1 = 0;
if(1 == pointSetting.getWorkPointOpen()){
- signPoint1 = new BigDecimal(signPoint1).multiply(pointSetting.getWorkPoint().divide(new BigDecimal(100))).intValue();
+ signPoint1 = new BigDecimal(signPoint).multiply(pointSetting.getWorkPoint().divide(new BigDecimal(100))).intValue();
}
Integer lavePoint = appUser.getLavePoint();
appUser.setTotalPoint(appUser.getTotalPoint() + signPoint);
appUser.setLavePoint(appUser.getLavePoint() + signPoint);
appUser.setAvailablePoint(appUser.getAvailablePoint() + signPoint1);
+ if(null != pointSetting && 1 == pointSetting.getWorkPointGift()){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() + signPoint1);
+ }
appUser.setTotalSignPoint(appUser.getTotalSignPoint() + signPoint);
appUserService.updateById(appUser);
--
Gitblit v1.7.1