From 49e96cc15baf35d710fe3a049fb97aff6a1af132 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 25 二月 2025 19:35:33 +0800
Subject: [PATCH] 修改分佣逻辑
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
index bdcf3dd..d0e20c6 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
@@ -2,12 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.AppUserGiveawayTemporary;
import com.ruoyi.account.api.model.BalanceChangeRecordCopy;
import com.ruoyi.account.api.model.WithdrawalRequests;
-import com.ruoyi.account.service.AppUserService;
-import com.ruoyi.account.service.BalanceChangeRecordCopyService;
-import com.ruoyi.account.service.WalletService;
-import com.ruoyi.account.service.WithdrawalRequestsService;
+import com.ruoyi.account.service.*;
import com.ruoyi.account.vo.WalletVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.VipSetting;
@@ -28,7 +26,7 @@
@Resource
private WithdrawalRequestsService withdrawalRequestsService;
@Resource
- private BalanceChangeRecordCopyService balanceChangeRecordCopyService;
+ private IAppUserGiveawayTemporaryService appUserGiveawayTemporaryService;
@Override
@@ -44,14 +42,12 @@
throw new RuntimeException("会员设置信息为空");
}
- List<BalanceChangeRecordCopy> recordCopies = balanceChangeRecordCopyService.list(new LambdaQueryWrapper<BalanceChangeRecordCopy>()
- .eq(BalanceChangeRecordCopy::getAppUserId, userId)
- .eq(BalanceChangeRecordCopy::getChangeType, 4));
-
- BigDecimal commissionAmount = recordCopies.stream()
- .map(BalanceChangeRecordCopy::getChangeAmount)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
-
+
+ List<AppUserGiveawayTemporary> list = appUserGiveawayTemporaryService.list(new LambdaQueryWrapper<AppUserGiveawayTemporary>().eq(AppUserGiveawayTemporary::getAppUserId, userId));
+ BigDecimal commissionAmount = BigDecimal.ZERO;
+ if(list.size() > 0){
+ commissionAmount = list.stream().map(AppUserGiveawayTemporary::getTotalDistributionAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
// 获取提现审核中的金额
List<WithdrawalRequests> waitAuditList = withdrawalRequestsService.list(new LambdaQueryWrapper<WithdrawalRequests>()
@@ -62,7 +58,7 @@
WalletVO walletVO = new WalletVO();
BigDecimal balance = appUser.getBalance();
- walletVO.setCommissionAmount(commissionAmount);
+ walletVO.setCommissionAmount(appUser.getTotalDistributionAmount().add(commissionAmount).setScale(2, BigDecimal.ROUND_HALF_UP));
walletVO.setWithdrawalAmount(appUser.getWithdrawableAmount());
walletVO.setWithdrawnAmount(appUser.getWithdrawnAmount().subtract(reduce));
walletVO.setVipWithdrawalMinAmount(data.getVipWithdrawalMinAmount());
--
Gitblit v1.7.1