From 11e14ba210ed19aaf89cade6d5b51b6c53ca38aa Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Tue, 13 Dec 2022 16:54:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
index 1a49f42..865f03f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -2,6 +2,16 @@
import cc.mrbird.febs.common.service.RedisService;
import org.springframework.beans.factory.annotation.Autowired;
+import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
+import cc.mrbird.febs.dapp.entity.DappMemberEntity;
+import cc.mrbird.febs.dapp.entity.DappSystemProfit;
+import cc.mrbird.febs.dapp.mapper.DappFundFlowDao;
+import cc.mrbird.febs.dapp.mapper.DappMemberDao;
+import cc.mrbird.febs.dapp.mapper.DappSystemProfitDao;
+import cc.mrbird.febs.rabbit.producer.ChainProducer;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.web3j.crypto.Credentials;
import org.web3j.protocol.Web3j;
@@ -14,10 +24,24 @@
import org.web3j.tx.gas.StaticGasProvider;
import java.math.BigInteger;
+import java.util.List;
@Component
public class ContractMain {
+
+ @Autowired
+ private DappFundFlowDao dappFundFlowDao;
+
+ @Autowired
+ private DappMemberDao dappMemberDao;
+
+ @Autowired
+ private DappSystemProfitDao dappSystemProfitDao;
+
+ @Autowired
+ private ChainProducer chainProducer;
+
private static Web3j web3;
@Autowired
@@ -50,6 +74,9 @@
// 合约地址 TODO
private static String contractAddr = "0x90EEba71E1d2D0C09840cdB9B74759dFAe15Fc7E";
+// private static String contractAddr = "0x4703cfEf33b6DbcF6a3020Ef98FC6ab9C4CC06b3";
+// private static String contractAddr = "0x8f444b9b9C71f4Be883aE15466D71EC7699Cb5B1";
+ private static String contractAddr = "0x4703cfEf33b6DbcF6a3020Ef98FC6ab9C4CC06b3";
// 操作账号 合约创建者的私钥 用于操作合约内方法 TODO
//private static String privateKey = "8ea073b74265f41a03138e1adf2e8a80f4f394ac5337aa2eec07562c1040a4e4";
@@ -85,19 +112,41 @@
System.out.println("regCode:"+regCode+",address:"+from);
// 更新区块编号 TODO
//redisService.set("BNB_BLOCK_NUMBER",e.log.getBlockNumber().intValue());
+ //投注人
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectByAddress(from, "BSC");
+ if(ObjectUtil.isNotEmpty(dappMemberEntity)){
+ //投注人是否加入
+ DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(dappMemberEntity.getId(), DappSystemProfit.STATE_IN);
+ if(ObjectUtil.isNotEmpty(dappSystemProfit)){
+ List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByState(DappFundFlowEntity.WITHDRAW_STATUS_ING);
+ if(CollUtil.isNotEmpty(dappFundFlowEntities)){
+ for(DappFundFlowEntity dappFundFlowEntity : dappFundFlowEntities){
+
+ //发送转币消息
+ chainProducer.sendBnbTransferMsg(dappFundFlowEntity.getId());
+// DappMemberEntity dappMember = dappMemberDao.selectById(dappFundFlowEntity.getMemberId());
+// trans(new BigInteger(dappFundFlowEntity.getAmount().toString()),dappMember.getAddress());
+ }
+ }
+ }
+ }
+
});
}
/**
* 从合约内转币到制定地址
*/
- public void trans(BigInteger amount, String to1){
+ public String trans(BigInteger amount, String to1){
+ String transactionHash = null;
Credentials credentials = Credentials.create(privateKey);
Abi contract = Abi.load(contractAddr, getInstance(), credentials, getStaticGasProvider());
try {
TransactionReceipt send = contract.trans(amount, to1).send();
+ transactionHash = send.getTransactionHash();
} catch (Exception exception) {
exception.printStackTrace();
}
+ return transactionHash;
}
}
--
Gitblit v1.9.1