From a9c9e15f24586a50611168b1315e6fd291ed3e1c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Dec 2022 14:23:49 +0800
Subject: [PATCH] 20221213转币
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 79715fa..6a8f05b 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
@@ -29,6 +29,7 @@
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;
@@ -358,17 +359,17 @@
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);
}
}
//如果还有剩余给技术方
if(levelProfitTotal.compareTo(systemProfitTotal) > 0){
BigDecimal avaProfit = levelProfitTotal.subtract(systemProfitTotal);
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(1L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(2L, 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());
@@ -422,7 +423,7 @@
DappSystemProfit dappSystemProfitNow = dappSystemProfitDao.selectByIdForUpdate(dappSystemProfit.getId(),DappSystemProfit.STATE_IN);
dappSystemProfitDao.updateStateById(DappSystemProfit.STATE_OUT,dappSystemProfitNow.getId());
- //todo 直接拿走0.95ge
+ // 直接拿走0.95ge
DataDictionaryCustom investAmountProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.INVEST_AMOUNT_PROFIT.getType(), DataDictionaryEnum.INVEST_AMOUNT_PROFIT.getCode());
BigDecimal investAmountProfit = new BigDecimal(investAmountProfitSet.getValue());
@@ -556,7 +557,7 @@
return;
}
//金额
- BigDecimal amount = dappFundFlow.getAmount();
+ BigDecimal amount = dappFundFlow.getAmount().setScale(BigDecimal.ROUND_DOWN,6);
//目标地址
Long memberId = dappFundFlow.getMemberId();
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
@@ -565,7 +566,9 @@
}
String address = dappMemberEntity.getAddress();
log.info("{}",address);
- String hash = contractMain.trans(new BigInteger(amount.toString()),address);
+ BigInteger bigInteger = new BigInteger(Convert.toWei(amount.toString(), Convert.Unit.ETHER).setScale(0).toString());
+ log.info("{}",bigInteger);
+ String hash = contractMain.trans(bigInteger,address);
if(StrUtil.isEmpty(hash)){
return;
}
--
Gitblit v1.9.1