From aa95efa9930ad77f5a9fe0cb9c517a216d937c7d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Sep 2023 18:19:14 +0800
Subject: [PATCH] 支付宝支付
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 95 insertions(+), 19 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..825447e 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;
@@ -14,6 +16,7 @@
import cc.mrbird.febs.mall.service.IMallMemberWithdrawService;
import cc.mrbird.febs.mall.service.MallMemberService;
import cc.mrbird.febs.mall.vo.CashOutSettingVo;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
@@ -25,6 +28,8 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
/**
* @author wzy
@@ -42,12 +47,23 @@
private final MallMemberPaymentMapper mallMemberPaymentMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallMemberBankMapper mallMemberBankMapper;
+ private final MallMemberAlipayMapper mallMemberAlipayMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public void withdrawal(WithdrawalDto withdrawalDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMember mallMember = mallMemberService.getById(memberId);
+
+ Integer outsideWith = mallMember.getOutsideWith() == null ? 2 :mallMember.getOutsideWith();
+ if (1 != outsideWith) {
+ throw new FebsException("功能升级中");
+ }
+ Integer isAuth = mallMember.getIsAuth();
+
+ if (1 != isAuth) {
+ throw new FebsException("未实名认证");
+ }
if (StrUtil.isBlank(mallMember.getTradePassword())) {
throw new FebsException("未设置支付密码");
}
@@ -62,27 +78,39 @@
cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
}
+ //每日提现额度上限
+ BigDecimal allCashOut = cashOutSettingVo.getAllCashOut();
+ if(withdrawalDto.getAmount().compareTo(allCashOut) > 0){
+ throw new FebsException("每日限额为"+cashOutSettingVo.getAllCashOut().setScale(2,BigDecimal.ROUND_DOWN));
+ }
+ List<MallMemberWithdraw> mallMemberWithdrawListDone = this.baseMapper.selectListByMemberIdAndDate(memberId,new Date());
+ if(CollUtil.isNotEmpty(mallMemberWithdrawListDone)){
+ BigDecimal amountTCAll = mallMemberWithdrawListDone.stream().map(MallMemberWithdraw::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ amountTCAll = amountTCAll.add(withdrawalDto.getAmount());
+ if (amountTCAll.compareTo(allCashOut) > 0) {
+ throw new FebsException("每日限额为"+cashOutSettingVo.getAllCashOut().setScale(2,BigDecimal.ROUND_DOWN));
+ }
+ }
+
if (withdrawalDto.getAmount().compareTo(cashOutSettingVo.getMinCashOut()) < 0) {
throw new FebsException("最小提现金额为"+cashOutSettingVo.getMinCashOut().setScale(2,BigDecimal.ROUND_DOWN));
}
- MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(withdrawalDto.getBankId());
- if(ObjectUtil.isEmpty(mallMemberBank)){
- throw new FebsException("未找到银行卡信息");
+ MallMemberAlipay mallMemberAlipay = mallMemberAlipayMapper.selectById(withdrawalDto.getBankId());
+// MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(withdrawalDto.getBankId());
+ if(ObjectUtil.isEmpty(mallMemberAlipay)){
+ 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("提现金额不足");
-// }
+// if(ObjectUtil.isEmpty(mallMemberBank.getBankName())){
+// throw new FebsException("请填写所属银行");
+// }
+// if(ObjectUtil.isEmpty(mallMemberBank.getSubbranchName())){
+// throw new FebsException("请填写所属支行");
+// }
+// if(ObjectUtil.isEmpty(mallMemberBank.getDigitalNo())){
+// throw new FebsException("请填写数字货币账号");
// }
-// BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
// 可提现
BigDecimal canMoney = wallet.getBalance();
@@ -91,8 +119,55 @@
throw new FebsException("提现金额不足");
}
- BigDecimal serviceFee = cashOutSettingVo.getServiceFee().multiply(BigDecimal.valueOf(0.01));
- walletService.reduce(withdrawalDto.getAmount(), memberId, "commission");
+ BigDecimal serviceFeePercent = cashOutSettingVo.getServiceFee().multiply(BigDecimal.valueOf(0.01));
+ BigDecimal serviceFee = serviceFeePercent.multiply(withdrawalDto.getAmount());
+ String remark = AppContants.MEMBER_WITHDRAW_NORMAL;
+// DataDictionaryCustom voucherOnOffDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+// GreenScoreEnum.VOUCHER_ON_OFF.getType(),
+// GreenScoreEnum.VOUCHER_ON_OFF.getCode()
+// );
+// if(ObjectUtil.isNotEmpty(voucherOnOffDic)){
+// String voucherOnOff = voucherOnOffDic.getValue();
+// /**
+// * 绿色凭证提现开关 1:开启 2：关闭
+// * 验证账户凭证数量
+// * 不需要手续费
+// * 减少用户的凭证数量
+// */
+// if("1".equals(voucherOnOff)){
+// BigDecimal voucherCntDto = withdrawalDto.getVoucherCnt();
+// if(voucherCntDto.compareTo(BigDecimal.ZERO) <= 0){
+// throw new FebsException("能量不足");
+// }
+// //提现需要的凭证数量 = 提现金额 * 余额提现需要绿色凭证比例
+// DataDictionaryCustom voucherPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+// GreenScoreEnum.VOUCHER_PERCENT.getType(),
+// GreenScoreEnum.VOUCHER_PERCENT.getCode()
+// );
+// BigDecimal voucherPercent = new BigDecimal(voucherPercentDic.getValue() == null ? "0" : voucherPercentDic.getValue()).multiply(new BigDecimal(0.01));
+// BigDecimal voucherPercentNeed = withdrawalDto.getAmount().multiply(voucherPercent).setScale(2,BigDecimal.ROUND_DOWN);
+//
+// DataDictionaryCustom scorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+// GreenScoreEnum.SCORE_PRICE.getType(),
+// GreenScoreEnum.SCORE_PRICE.getCode());
+// BigDecimal scorePrice = new BigDecimal(scorePriceDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
+// voucherPercentNeed = voucherPercentNeed.divide(scorePrice,2,BigDecimal.ROUND_DOWN);
+//
+//// BigDecimal voucherCnt = wallet.getVoucherCnt();
+// BigDecimal voucherFireCnt = wallet.getVoucherFireCnt();
+// if(voucherFireCnt.compareTo(voucherPercentNeed) < 0){
+// throw new FebsException("能量不足");
+// }
+//
+//// walletService.reduce(voucherCntDto, memberId, "voucherCnt");
+// walletService.reduce(voucherCntDto, memberId, "voucherFireCnt");
+// serviceFee = voucherCntDto;
+// remark = AppContants.MEMBER_WITHDRAW_VOUCHER;
+// }
+// }
+
+
+ walletService.reduce(withdrawalDto.getAmount(), memberId, "balance");
String orderNo = MallUtils.getOrderNum("W");
MallMemberWithdraw withdraw = new MallMemberWithdraw();
@@ -100,10 +175,11 @@
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(remark);
+ withdraw.setWtihdrawTypeId(mallMemberAlipay.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().negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1, FlowTypeEnum.BALANCE.getValue());
}
}
--
Gitblit v1.9.1