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/AppUserShareController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShareController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShareController.java
index 9281143..2ded011 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShareController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShareController.java
@@ -63,14 +63,17 @@
PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
if(null != pointSetting){
Integer everySharePoint = pointSetting.getEverySharePoint();
- Integer everySharePoint1 = everySharePoint;
+ Integer everySharePoint1 = 0;
if(1 == pointSetting.getWorkPointOpen()){
- everySharePoint1 = new BigDecimal(everySharePoint1).multiply(pointSetting.getWorkPoint().divide(new BigDecimal(100))).intValue();
+ everySharePoint1 = new BigDecimal(everySharePoint).multiply(pointSetting.getWorkPoint().divide(new BigDecimal(100))).intValue();
}
Integer lavePoint = appUser.getLavePoint();
appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint);
appUser.setLavePoint(appUser.getLavePoint() + everySharePoint);
appUser.setAvailablePoint(appUser.getAvailablePoint() + everySharePoint1);
+ if(null != pointSetting && 1 == pointSetting.getWorkPointGift()){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() + everySharePoint1);
+ }
appUser.setTotalSharePoint(appUser.getTotalSharePoint() + everySharePoint);
appUserService.updateById(appUser);
//添加积分变动记录
--
Gitblit v1.7.1