From 2ccfd486a7e82b71bbac81d121a7c5dae752db4d Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 25 Apr 2023 17:09:46 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 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 1da69e8..5fcd58a 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
@@ -2,8 +2,10 @@
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.GreenScoreEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.WithdrawalDto;
@@ -70,29 +72,31 @@
if(ObjectUtil.isEmpty(mallMemberBank)){
throw new FebsException("未找到银行卡信息");
}
+ if(ObjectUtil.isEmpty(mallMemberBank.getBankName())){
+ throw new FebsException("请填写所属银行");
+ }
+ if(ObjectUtil.isEmpty(mallMemberBank.getSubbranchName())){
+ throw new FebsException("请填写所属支行");
+ }
-// 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("提现金额不足");
-// }
-// }
-
-// BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
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.getBalance();
+ BigDecimal canMoney = wallet.getCommission();
+ if (profit != null) {
+ if(canMoney.subtract(serviceFee).compareTo(BigDecimal.ZERO) > 0) {
+ canMoney = canMoney.subtract(profit);
+ }
+ }
if(withdrawalDto.getAmount().compareTo(canMoney) > 0) {
throw new FebsException("提现金额不足");
}
- BigDecimal serviceFee = cashOutSettingVo.getServiceFee().multiply(BigDecimal.valueOf(0.01));
- walletService.reduce(withdrawalDto.getAmount(), memberId, "commission");
+ walletService.reduce(withdrawalDto.getAmount().add(serviceFee), memberId, "commission");
String orderNo = MallUtils.getOrderNum("W");
MallMemberWithdraw withdraw = new MallMemberWithdraw();
@@ -100,10 +104,10 @@
withdraw.setMemberId(memberId);
withdraw.setAmount(withdrawalDto.getAmount());
withdraw.setStatus(1);
- withdraw.setAmountFee(serviceFee.multiply(withdrawalDto.getAmount()));
+ withdraw.setAmountFee(serviceFee);
withdraw.setWtihdrawTypeId(mallMemberBank.getId());
this.baseMapper.insert(withdraw);
- mallMemberService.addMoneyFlow(memberId, withdrawalDto.getAmount().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