From 1184884aef7afc537cfbfe6306a9897e94906756 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Sep 2022 10:36:04 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 12 ++++++++----
1 files changed, 8 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 d23bbff..a35d424 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,13 +80,16 @@
}
walletService.reduce(withdrawalDto.getAmount(), memberId, "balance");
- String withdrawalNo = "TX."+MallUtils.getOrderNum();
+// String withdrawalNo = "TX_"+MallUtils.getOrderNum();
MallMemberWithdraw withdraw = new MallMemberWithdraw();
- withdraw.setWithdrawNo(withdrawalNo);
+// withdraw.setWithdrawNo(withdrawalNo);
withdraw.setMemberId(memberId);
withdraw.setAmount(withdrawalDto.getAmount());
withdraw.setStatus(1);
this.baseMapper.insert(withdraw);
+ String withdrawalNo = "TX_"+withdraw.getId().toString();
+ withdraw.setWithdrawNo(withdrawalNo);
+ this.baseMapper.updateById(withdraw);
mallMemberService.addMoneyFlow(memberId, withdrawalDto.getAmount().negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), withdrawalNo, null, null, null, 1, FlowTypeEnum.BALANCE.getValue());
}
--
Gitblit v1.9.1