From 05a18b27be6ecfbbc080388f92c0d1857eeffb94 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Dec 2022 17:32:23 +0800
Subject: [PATCH] 20221213转币
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 386522b..36a9c34 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.utils.SpringContextUtil;
import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
+import cc.mrbird.febs.dapp.contract.ContractMain;
import cc.mrbird.febs.dapp.dto.SystemDto;
import cc.mrbird.febs.dapp.dto.TransferDto;
import cc.mrbird.febs.dapp.entity.*;
@@ -28,8 +29,10 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.web3j.utils.Convert;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.math.RoundingMode;
import java.util.*;
@@ -53,6 +56,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final DappSystemProfitDao dappSystemProfitDao;
private final ChainProducer chainProducer;
+ private final ContractMain contractMain;
@Override
@@ -355,7 +359,7 @@
DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), memberLevelProfit, 4, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
- chainProducer.sendBnbTransferMsg(fundFlow.getId());
+// chainProducer.sendBnbTransferMsg(fundFlow.getId());
systemProfitTotal = systemProfitTotal.add(memberLevelProfit);
}
}
@@ -365,7 +369,7 @@
DappFundFlowEntity fundFlow = new DappFundFlowEntity(1L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
- chainProducer.sendBnbTransferMsg(fundFlow.getId());
+// chainProducer.sendBnbTransferMsg(fundFlow.getId());
}
dappSystemProfitDao.updateLevelProfitById(DappSystemProfit.ENUM_YES,dappSystemProfit.getId());
@@ -493,6 +497,9 @@
if(CollUtil.isNotEmpty(refererIdList)){
for(String inviteIdStr : refererIdList){
DappMemberEntity dappMemberEntityUp = dappMemberDao.selectMemberInfoByInviteId(inviteIdStr);
+ if(ObjectUtil.isEmpty(dappMemberEntityUp)){
+ continue;
+ }
String accountType = dappMemberEntityUp.getAccountType();
if(DataDictionaryEnum.BIG_BOSS.getCode().equals(accountType)){
continue;
@@ -541,23 +548,30 @@
@Override
public void bnbTransferTest(Long id) {
DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+ if(ObjectUtil.isEmpty(dappFundFlow)){
+ return;
+ }
//用户已经加入动能队列
DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
if(ObjectUtil.isEmpty(dappSystemProfit)){
return;
}
- if(ObjectUtil.isEmpty(dappFundFlow)){
- return;
- }
//金额
BigDecimal amount = dappFundFlow.getAmount();
//目标地址
- String address = dappFundFlow.getAddress();
- String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
+ Long memberId = dappFundFlow.getMemberId();
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ return;
+ }
+ String address = dappMemberEntity.getAddress();
+ log.info("{}",address);
+ BigInteger bigInteger = new BigInteger(Convert.toWei(amount.toString(), Convert.Unit.ETHER).setScale(0).toString());
+ String hash = contractMain.trans(bigInteger,address);
if(StrUtil.isEmpty(hash)){
return;
}
- log.info("{},{}",id,hash);
+
dappFundFlow.setFromHash(hash);
dappFundFlowDao.updateById(dappFundFlow);
}
--
Gitblit v1.9.1