From efe035ac5d40da9e254a54164a8239ff0c62badb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 19:08:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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 65f5425..fe38178 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
@@ -43,17 +43,15 @@
List<WithdrawalRequests> waitAuditList = withdrawalRequestsService.list(new LambdaQueryWrapper<WithdrawalRequests>()
.eq(WithdrawalRequests::getAppUserId, userId)
.eq(WithdrawalRequests::getAuditStatus, WithdrawalAuditStatus.WAIT_AUDIT));
-
+ BigDecimal reduce = waitAuditList.stream().map(WithdrawalRequests::getWithdrawalAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
WalletVO walletVO = new WalletVO();
walletVO.setWithdrawalAmount(appUser.getWithdrawableAmount());
- walletVO.setWithdrawnAmount(appUser.getWithdrawnAmount());
+ walletVO.setWithdrawnAmount(appUser.getWithdrawnAmount().subtract(reduce));
walletVO.setVipWithdrawalMinAmount(data.getVipWithdrawalMinAmount());
walletVO.setTotalRechargeAmount(appUser.getTotalRechargeAmount());
walletVO.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount());
walletVO.setTotalDistributionAmount(appUser.getTotalDistributionAmount());
- walletVO.setAuditAmount(waitAuditList.stream()
- .map(WithdrawalRequests::getWithdrawalAmount)
- .reduce(BigDecimal.ZERO, BigDecimal::add));
+ walletVO.setAuditAmount(reduce);
walletVO.setBalance(appUser.getBalance());
return walletVO;
}
--
Gitblit v1.7.1