From 615b4cba39cc01756d7c0299204cc6ecaf172be5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 09 Jan 2023 16:11:38 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 9ac3bc0..561c66c 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
@@ -61,16 +61,14 @@
cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
}
- if (withdrawalDto.getAmount().compareTo(cashOutSettingVo.getMinCashOut()) < 0) {
- throw new FebsException("最小提现金额为"+cashOutSettingVo.getMinCashOut().setScale(2,BigDecimal.ROUND_DOWN));
+ if (withdrawalDto.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new FebsException("请输入正确的提现金额");
+ }
+ if(ObjectUtil.isEmpty(withdrawalDto.getBankNo())){
+ throw new FebsException("请输入地址");
}
- MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(withdrawalDto.getBankId());
- if(ObjectUtil.isEmpty(mallMemberBank)){
- throw new FebsException("未找到地址信息");
- }
-
- BigDecimal serviceFee = cashOutSettingVo.getServiceFee().multiply(BigDecimal.valueOf(0.01));
+ BigDecimal serviceFee = cashOutSettingVo.getServiceFee();
String orderNo = MallUtils.getOrderNum("W");
//减少用户余额
memberWalletService.reduce(withdrawalDto.getAmount(), memberId, "balance");
@@ -80,14 +78,15 @@
withdraw.setMemberId(memberId);
withdraw.setAmount(withdrawalDto.getAmount());
withdraw.setStatus(1);
- withdraw.setAmountFee(serviceFee.multiply(withdrawalDto.getAmount()));
- withdraw.setWtihdrawTypeId(mallMemberBank.getId());
+ withdraw.setAmountFee(serviceFee);
+ withdraw.setRemark(withdrawalDto.getBankNo());
+// withdraw.setWtihdrawTypeId(mallMemberBank.getId());
this.baseMapper.insert(withdraw);
//生成提现流水记录
Long subsidyAmountFlowId = mallMoneyFlowService.addMoneyFlow(
memberId,
orderNo,
- withdrawalDto.getAmount(),
+ withdrawalDto.getAmount().negate(),
MallMoneyFlowTypeEnum.WITHDRAW.getCode(),
MallMoneyFlow.STATUS_ING,
MallMoneyFlow.IS_RETURN_Y,
--
Gitblit v1.9.1