From 4e01b27642aa6195e4c8a5f49a64e76dd7dea06d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 07 Apr 2023 15:46:20 +0800
Subject: [PATCH] Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hongloumeng
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 7f91b34..1f3041f 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
@@ -99,22 +99,22 @@
if("1".equals(voucherOnOff)){
BigDecimal voucherCntDto = withdrawalDto.getVoucherCnt();
if(voucherCntDto.compareTo(BigDecimal.ZERO) <= 0){
- throw new FebsException("绿色积分不足");
+ 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());
+ 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);
BigDecimal voucherCnt = wallet.getVoucherCnt();
if(voucherCnt.compareTo(voucherPercentNeed) < 0){
- throw new FebsException("绿色积分不足");
+ throw new FebsException("红豆不足");
}
- walletService.reduce(voucherCntDto, memberId, "voucher_cnt");
+ walletService.reduce(voucherCntDto, memberId, "voucherCnt");
serviceFee = voucherCntDto;
remark = AppContants.MEMBER_WITHDRAW_VOUCHER;
}
--
Gitblit v1.9.1