From 100bf3683112bad53dac1e9d1f6bc43193faedd0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Aug 2023 10:49:15 +0800
Subject: [PATCH] jufu商城
---
src/main/java/cc/mrbird/febs/mall/dto/WithdrawalDto.java | 18 ++++----
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 101 +++++++++++++++++++++++++-------------------------
2 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/WithdrawalDto.java b/src/main/java/cc/mrbird/febs/mall/dto/WithdrawalDto.java
index 9e37ecf..5cb0dfd 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/WithdrawalDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/WithdrawalDto.java
@@ -22,20 +22,20 @@
@ApiModelProperty(value = "金额")
private BigDecimal amount;
- @ApiModelProperty(value = "绿色积分数量")
- private BigDecimal voucherCnt;
+// @ApiModelProperty(value = "绿色积分数量")
+// private BigDecimal voucherCnt;
@NotBlank(message = "参数不能为空")
@ApiModelProperty(value = "交易密码")
private String tradePwd;
- @ApiModelProperty(value = "银行卡号")
- private String bankNo;
+// @ApiModelProperty(value = "银行卡号")
+// private String bankNo;
+//
+// @ApiModelProperty(value = "姓名")
+// private String name;
- @ApiModelProperty(value = "姓名")
- private String name;
-
- @NotNull(message = "银行卡不能为空")
- @ApiModelProperty(value = "用户银行卡ID")
+ @NotNull(message = "支付宝账户不能为空")
+ @ApiModelProperty(value = "支付宝账户ID")
private Long bankId;
}
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 d9eddd8..bd6b9b0 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
@@ -92,15 +92,16 @@
}
MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(withdrawalDto.getBankId());
+// MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(withdrawalDto.getBankId());
if(ObjectUtil.isEmpty(mallMemberBank)){
- throw new FebsException("未找到银行卡信息");
+ throw new FebsException("未找到支付宝信息");
}
- if(ObjectUtil.isEmpty(mallMemberBank.getBankName())){
- throw new FebsException("请填写所属银行");
- }
- if(ObjectUtil.isEmpty(mallMemberBank.getSubbranchName())){
- 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("请填写数字货币账号");
// }
@@ -116,49 +117,49 @@
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;
- }
- }
+// 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");
--
Gitblit v1.9.1