From 9e967b72ff25e77697b03ccae779404bc074ce23 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 12 Apr 2023 14:34:00 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 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 d200c6d..b24228a 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
@@ -106,15 +106,23 @@
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){
+ 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, "voucherCnt");
+ walletService.reduce(voucherCntDto, memberId, "voucherFireCnt");
serviceFee = voucherCntDto;
remark = AppContants.MEMBER_WITHDRAW_VOUCHER;
}
--
Gitblit v1.9.1