From 742452d530eb37c1990996a5d625a3fb56d2b59c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 25 Apr 2023 23:03:10 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 12 +++---------
1 files changed, 3 insertions(+), 9 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 ca2d8fe..21e8f88 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
@@ -80,19 +80,13 @@
}
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
- BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
BigDecimal serviceFeePercent = cashOutSettingVo.getServiceFee().multiply(BigDecimal.valueOf(0.01));
BigDecimal serviceFee = serviceFeePercent.multiply(withdrawalDto.getAmount());
// 可提现
- BigDecimal canMoney = wallet.getCommission();
- if (profit != null) {
- if(canMoney.subtract(serviceFee).compareTo(BigDecimal.ZERO) > 0) {
- canMoney = canMoney.subtract(profit);
- }
- }
+ BigDecimal canMoney = wallet.getBalance();
- if(withdrawalDto.getAmount().compareTo(canMoney) > 0) {
+ if(withdrawalDto.getAmount().add(serviceFee).compareTo(canMoney) > 0) {
throw new FebsException("提现金额不足");
}
@@ -109,6 +103,6 @@
withdraw.setRemark(AppContants.MEMBER_WITHDRAW_NORMAL);
this.baseMapper.insert(withdraw);
- mallMemberService.addMoneyFlow(memberId, withdrawalDto.getAmount().add(serviceFee).negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1, FlowTypeEnum.COMMISSION.getValue());
+ mallMemberService.addMoneyFlow(memberId, withdrawalDto.getAmount().add(serviceFee).negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1, FlowTypeEnum.BALANCE.getValue());
}
}
--
Gitblit v1.9.1