From 2cb25f9207a432a01b72b32b3b5ab8fc7e00da5a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Mar 2023 15:43:38 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
index 02e5fbb..1da69e8 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
@@ -71,15 +71,24 @@
throw new FebsException("未找到银行卡信息");
}
- BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
- MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
- if (profit != null) {
- // 可提现
- BigDecimal canMoney = wallet.getCommission().subtract(profit);
+// BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
+// MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+// if (profit != null) {
+// // 可提现
+// BigDecimal canMoney = wallet.getCommission().subtract(profit);
+//
+// if(withdrawalDto.getAmount().compareTo(canMoney) > 0) {
+// throw new FebsException("提现金额不足");
+// }
+// }
- if(withdrawalDto.getAmount().compareTo(canMoney) > 0) {
- throw new FebsException("提现金额不足");
- }
+// BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
+ MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ // 可提现
+ BigDecimal canMoney = wallet.getBalance();
+
+ if(withdrawalDto.getAmount().compareTo(canMoney) > 0) {
+ throw new FebsException("提现金额不足");
}
BigDecimal serviceFee = cashOutSettingVo.getServiceFee().multiply(BigDecimal.valueOf(0.01));
--
Gitblit v1.9.1