From 34ce46da72d7b0b707986ed0f2b6174021bc25ea Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Dec 2022 15:13:23 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
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 e1615c5..5ca0cc5 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
@@ -82,6 +82,16 @@
walletInfo.setProfit(dappFundFlowDao.selectProfitAmountByMemberId(member.getId()));
walletInfo.setTfcBalance(walletMine.getAvailableAmount());
walletInfo.setSafePool(mineData.getSafePool());
+
+ walletInfo.setAccountType(memberInfo.getAccountType());
+ DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(memberInfo.getId(),DappSystemProfit.STATE_IN);
+ walletInfo.setSystemProfitId(ObjectUtil.isEmpty(dappSystemProfit) ? 0L : dappSystemProfit.getId());
+ BigDecimal directProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),3,2);
+ walletInfo.setDirectProfit(directProfit);
+ BigDecimal levelProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),4,2);
+ walletInfo.setLevelProfit(levelProfit);
+ BigDecimal luckyProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),7,2);
+ walletInfo.setLuckyProfit(luckyProfit);
return walletInfo;
}
@@ -133,6 +143,7 @@
@Override
public Long transfer(TransferDto transferDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
+// DappMemberEntity member = dappMemberDao.selectById(transferDto.getMemberId());
String upgrade = redisUtils.getString("APP_UPGRADE");
if ("upgrade".equals(upgrade)) {
@@ -171,22 +182,32 @@
}
if ("success".equals(transferDto.getFlag())) {
+ DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+ if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
+ return null;
+ }
+ //是否已经加入动能
+ DappSystemProfit dappSystemProfitIng = dappSystemProfitDao.selectByMemberIdAndState(member.getId(), DappSystemProfit.STATE_IN);
+ if(ObjectUtil.isNotEmpty(dappSystemProfitIng)){
+ return null;
+ }
+
//插入一条会员入列记录,即加入动能队列
DappSystemProfit dappSystemProfit = new DappSystemProfit(member.getId(), transferDto.getAmount());
dappSystemProfitDao.insert(dappSystemProfit);
- //升级成为Agent
- dappMemberDao.updateMemberAccountType(DataDictionaryEnum.AGENT.getCode(),member.getId());
- DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
flow.setFromHash(transferDto.getTxHash());
flow.setSystemProfitId(dappSystemProfit.getId());
flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
dappFundFlowDao.updateById(flow);
+ //升级成为Agent
+ dappMemberDao.updateMemberAccountType(DataDictionaryEnum.AGENT.getCode(),member.getId());
+ dappMemberDao.updateMemberActiveStatus(1,member.getId());
//直接拿走0.05个BNB放入技术方
DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
- DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
dappFundFlowDao.insert(systemProfitFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
@@ -197,7 +218,8 @@
DataDictionaryCustom directProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
BigDecimal directProfitStr = new BigDecimal(StrUtil.isEmpty(directProfitSet.getValue()) ? "0.3" : directProfitSet.getValue());
- BigDecimal directProfit = (transferDto.getAmount().subtract(new BigDecimal(systemProfitStr))).multiply(directProfitStr).setScale(BigDecimal.ROUND_DOWN, 2);
+ BigDecimal subtract = transferDto.getAmount().subtract(new BigDecimal(systemProfitStr));
+ BigDecimal directProfit = subtract.multiply(directProfitStr).setScale(2,BigDecimal.ROUND_DOWN);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
@@ -387,6 +409,11 @@
throw new FebsException("功能升级中");
}
if ("success".equals(transferDto.getFlag())) {
+ //是否已经加入动能
+ DappSystemProfit dappSystemProfitIng = dappSystemProfitDao.selectByMemberIdAndState(member.getId(), DappSystemProfit.STATE_IN);
+ if(ObjectUtil.isNotEmpty(dappSystemProfitIng)){
+ return;
+ }
//插入一条会员入列记录,即加入动能队列
DappSystemProfit dappSystemProfit = new DappSystemProfit(member.getId(), transferDto.getAmount());
dappSystemProfitDao.insert(dappSystemProfit);
@@ -399,7 +426,7 @@
//直接拿走0.05个BNB放入技术方
DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
- DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
dappFundFlowDao.insert(systemProfitFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
@@ -410,7 +437,7 @@
DataDictionaryCustom directProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
BigDecimal directProfitStr = new BigDecimal(StrUtil.isEmpty(directProfitSet.getValue()) ? "0.3" : directProfitSet.getValue());
- BigDecimal directProfit = (transferDto.getAmount().subtract(new BigDecimal(systemProfitStr))).multiply(directProfitStr).setScale(BigDecimal.ROUND_DOWN, 2);
+ BigDecimal directProfit = (transferDto.getAmount().subtract(new BigDecimal(systemProfitStr))).multiply(directProfitStr).setScale(2,BigDecimal.ROUND_DOWN);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
--
Gitblit v1.9.1