From 113f3a5d3b843fba68ce50a3ba3255c66ca1e15f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 17 Jan 2023 20:13:57 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 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 9d16081..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
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.MallMoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -9,11 +10,9 @@
import cc.mrbird.febs.mall.dto.WithdrawalDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
-import cc.mrbird.febs.mall.service.IApiMallMemberService;
-import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
-import cc.mrbird.febs.mall.service.IMallMemberWithdrawService;
-import cc.mrbird.febs.mall.service.MallMemberService;
+import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.CashOutSettingVo;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSONObject;
@@ -21,6 +20,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
@@ -36,11 +36,14 @@
private final IApiMallMemberService mallMemberService;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final MallMemberWalletMapper mallMemberWalletMapper;
- private final IApiMallMemberWalletService walletService;
+ private final IApiMallMemberWalletService memberWalletService;
private final MallMemberPaymentMapper mallMemberPaymentMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final MallMemberBankMapper mallMemberBankMapper;
+ private final IMallMoneyFlowService mallMoneyFlowService;
@Override
+ @Transactional(rollbackFor = Exception.class)
public void withdrawal(WithdrawalDto withdrawalDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMember mallMember = mallMemberService.getById(memberId);
@@ -52,45 +55,44 @@
throw new FebsException("支付密码错误");
}
- if (withdrawalDto.getAmount().compareTo(BigDecimal.valueOf(100)) < 0) {
- throw new FebsException("最小提现金额为100");
- }
-
- MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(memberId);
- if (payment == null) {
- 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("提现金额不足");
- }
- }
-
CashOutSettingVo cashOutSettingVo = new CashOutSettingVo();
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CASHOUT_SETTING.getType(), DataDictionaryEnum.CASHOUT_SETTING.getCode());
if (dic != null) {
cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
}
- BigDecimal serviceFee = cashOutSettingVo.getServiceFee().multiply(BigDecimal.valueOf(0.01));
+ if (withdrawalDto.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new FebsException("请输入正确的提现金额");
+ }
+ if(ObjectUtil.isEmpty(withdrawalDto.getBankNo())){
+ throw new FebsException("请输入地址");
+ }
- walletService.reduce(withdrawalDto.getAmount(), memberId, "commission");
+ BigDecimal serviceFee = cashOutSettingVo.getServiceFee();
String orderNo = MallUtils.getOrderNum("W");
-
+ //减少用户余额
+ memberWalletService.reduce(withdrawalDto.getAmount(), memberId, "balance");
+ //生成提现记录
MallMemberWithdraw withdraw = new MallMemberWithdraw();
withdraw.setWithdrawNo(orderNo);
withdraw.setMemberId(memberId);
withdraw.setAmount(withdrawalDto.getAmount());
withdraw.setStatus(1);
- withdraw.setAmountFee(serviceFee.multiply(withdrawalDto.getAmount()));
+ withdraw.setAmountFee(serviceFee);
+ withdraw.setRemark(withdrawalDto.getBankNo());
+// 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());
+ //生成提现流水记录
+ Long subsidyAmountFlowId = mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ orderNo,
+ withdrawalDto.getAmount().negate(),
+ MallMoneyFlowTypeEnum.WITHDRAW.getCode(),
+ MallMoneyFlow.STATUS_ING,
+ MallMoneyFlow.IS_RETURN_Y,
+ mallMember.getId(),
+ FlowTypeEnum.BALANCE.getValue(),
+ MallMoneyFlowTypeEnum.WITHDRAW.getName()
+ );
}
}
--
Gitblit v1.9.1