From a19e7b6b1088b2860d41c1bbe640c156cdad3dfc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 12 Apr 2023 14:25:10 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java |    6 ++++++
 src/main/resources/mapper/modules/MallMemberWalletMapper.xml                      |    2 +-
 2 files changed, 7 insertions(+), 1 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 ceb4d6c..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
@@ -109,6 +109,12 @@
                 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){
diff --git a/src/main/resources/mapper/modules/MallMemberWalletMapper.xml b/src/main/resources/mapper/modules/MallMemberWalletMapper.xml
index 189bcc1..1839ab1 100644
--- a/src/main/resources/mapper/modules/MallMemberWalletMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberWalletMapper.xml
@@ -156,7 +156,7 @@
     <update id="addVorCherAmountAndCntById">
         update mall_member_wallet
         <set>
-            voucher_amount = voucher_amount + #{voucherAmount},
+            balance = balance + #{voucherAmount},
             voucher_cnt = voucher_cnt - #{voucherCnt},
         </set>
         WHERE id =  #{id}

--
Gitblit v1.9.1