From 5a4ab1f92adb1f6d7e3596388bcebc77709e460f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Sep 2022 18:30:32 +0800
Subject: [PATCH] 20220822

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 d23bbff..8cc641c 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
@@ -22,6 +22,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 
@@ -42,6 +43,7 @@
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void withdrawal(WithdrawalDto withdrawalDto) {
         Long memberId = LoginUserUtil.getLoginUser().getId();
         MallMember mallMember = mallMemberService.getById(memberId);
@@ -59,9 +61,8 @@
         if (dic != null) {
             cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
         }
-        DataDictionaryCustom withdrawalCnt = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MEMBER_WITHDRAWAL_CNT.getType(), DataDictionaryEnum.MEMBER_WITHDRAWAL_CNT.getCode());
         if (withdrawalDto.getAmount().compareTo(cashOutSettingVo.getMinCashOut()) < 0) {
-            throw new FebsException("最小提现金额为"+withdrawalCnt.getValue()+"元");
+            throw new FebsException("最小提现金额为"+cashOutSettingVo.getMinCashOut()+"元");
         }
 
         String openId = mallMember.getOpenId();
@@ -79,7 +80,7 @@
         }
 
         walletService.reduce(withdrawalDto.getAmount(), memberId, "balance");
-        String withdrawalNo = "TX."+MallUtils.getOrderNum();
+        String withdrawalNo = "TX_"+MallUtils.getOrderNum();
         MallMemberWithdraw withdraw = new MallMemberWithdraw();
         withdraw.setWithdrawNo(withdrawalNo);
         withdraw.setMemberId(memberId);

--
Gitblit v1.9.1