From c24e182e6ba82ddb167f7c1f640c68aaec0ab0b7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 21 Mar 2022 14:34:23 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 5 ++++-
src/main/java/cc/mrbird/febs/common/interceptor/MybatisInterceptor.java | 4 ++--
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 10 +++++++++-
src/main/resources/mapper/dapp/DappWalletCoinDao.xml | 2 +-
src/main/resources/mapper/dapp/DappWalletMineDao.xml | 2 +-
5 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/interceptor/MybatisInterceptor.java b/src/main/java/cc/mrbird/febs/common/interceptor/MybatisInterceptor.java
index 172c7f1..d4de897 100644
--- a/src/main/java/cc/mrbird/febs/common/interceptor/MybatisInterceptor.java
+++ b/src/main/java/cc/mrbird/febs/common/interceptor/MybatisInterceptor.java
@@ -25,8 +25,8 @@
* @date 2020-05-13
**/
@Slf4j
-@Component
-@Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
+//@Component
+//@Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
public class MybatisInterceptor implements Interceptor {
@Override
public Object intercept(Invocation invocation) throws Throwable {
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index ac2a494..274d521 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -14,6 +14,7 @@
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
@@ -30,6 +31,7 @@
private final DappWalletMineDao dappWalletMineDao;
@Override
+ @Transactional(rollbackFor = Exception.class)
public void approve(ApproveDto approveDto) {
DappMemberEntity member = new DappMemberEntity();
member.setAddress(approveDto.getAddress());
@@ -59,15 +61,21 @@
}
}
member.setRefererIds(ids);
- dappMemberDao.updateById(member);
}
+ dappMemberDao.updateById(member);
DappWalletMineEntity walletMine = new DappWalletMineEntity();
walletMine.setMemberId(member.getId());
+ walletMine.setTotalAmount(BigDecimal.ZERO);
+ walletMine.setAvailableAmount(BigDecimal.ZERO);
+ walletMine.setFrozenAmount(BigDecimal.ZERO);
dappWalletMineDao.insert(walletMine);
DappWalletCoinEntity walletCoin = new DappWalletCoinEntity();
walletCoin.setMemberId(member.getId());
+ walletCoin.setTotalAmount(BigDecimal.ZERO);
+ walletCoin.setAvailableAmount(BigDecimal.ZERO);
+ walletCoin.setFrozenAmount(BigDecimal.ZERO);
dappWalletCoinDao.insert(walletCoin);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 6c2368e..c667864 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -14,6 +14,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
@@ -48,6 +49,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void change(WalletOperateDto walletOperateDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -85,6 +87,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void withdraw(WalletOperateDto walletOperateDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -102,7 +105,7 @@
DappFundFlowEntity fund = new DappFundFlowEntity(member.getId(), walletOperateDto.getAmount().negate(), AppContants.MONEY_TYPE_WITHDRAWAL, 1);
dappFundFlowDao.insert(fund);
- DappAccountMoneyChangeEntity usdtChange = new DappAccountMoneyChangeEntity(member.getId(), preAmount, walletOperateDto.getAmount(), walletCoin.getTotalAmount(), "USDT申请提现", AppContants.MONEY_TYPE_WITHDRAWAL);
+ DappAccountMoneyChangeEntity usdtChange = new DappAccountMoneyChangeEntity(member.getId(), preAmount, walletOperateDto.getAmount(), walletCoin.getAvailableAmount(), "USDT申请提现", AppContants.MONEY_TYPE_WITHDRAWAL);
dappAccountMoneyChangeDao.insert(usdtChange);
}
diff --git a/src/main/resources/mapper/dapp/DappWalletCoinDao.xml b/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
index dd1ed66..fc226e9 100644
--- a/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
+++ b/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
@@ -3,6 +3,6 @@
<mapper namespace="cc.mrbird.febs.dapp.mapper.DappWalletCoinDao">
<select id="selectByMemberId" resultType="cc.mrbird.febs.dapp.entity.DappWalletCoinEntity">
- select * from dapp_member_coin where member_id=#{memberId}
+ select * from dapp_wallet_coin where member_id=#{memberId}
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/dapp/DappWalletMineDao.xml b/src/main/resources/mapper/dapp/DappWalletMineDao.xml
index 7e11c47..7de979e 100644
--- a/src/main/resources/mapper/dapp/DappWalletMineDao.xml
+++ b/src/main/resources/mapper/dapp/DappWalletMineDao.xml
@@ -3,6 +3,6 @@
<mapper namespace="cc.mrbird.febs.dapp.mapper.DappWalletMineDao">
<select id="selectByMemberId" resultType="cc.mrbird.febs.dapp.entity.DappWalletMineEntity">
- select * from dapp_member_mine where member_id=#{memberId}
+ select * from dapp_wallet_mine where member_id=#{memberId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1