From 9767a92438fc62620e99936845a2998b0964ba94 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 16:34:44 +0800
Subject: [PATCH] 增加空判断
---
src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 7e6ff46..7e5d899 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -96,7 +96,7 @@
// private static String contractAddr = "0x4703cfEf33b6DbcF6a3020Ef98FC6ab9C4CC06b3";
// private static String contractAddr = "0x8f444b9b9C71f4Be883aE15466D71EC7699Cb5B1";
- // 操作账号 合约创建者的私钥 用于操作合约内方法 TODO
+ // 操作账号 手续费钱包地址的私钥（合约里会把手续费转到你这个私钥地址上） 用于操作合约内方法 TODO
//private static String privateKey = "8ea073b74265f41a03138e1adf2e8a80f4f394ac5337aa2eec07562c1040a4e4";
private static String privateKey = "0xbf6f11f5689961d5351375bebbae751de0d0d5c2e2095c1017368485dc909ff8";
@@ -127,25 +127,30 @@
String regCode = e.regCode;
// 投注人的地址
String from = e.from;
+ if(from==null){
+ // 为空则不进入后续逻辑
+ return;
+ }
+
// TODO 业务操作逻辑代码
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 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());
+// }
+// }
+// }
+// }
}catch (Exception exception) {
exception.printStackTrace();
}
@@ -160,6 +165,7 @@
Credentials credentials = Credentials.create(privateKey);
Abi contract = Abi.load(contractAddr, getInstance(), credentials, getStaticGasProvider());
try {
+ //BigInteger bigInteger = Convert.toWei(amount.toString(), Convert.Unit.ETHER).toBigInteger();
TransactionReceipt send = contract.trans(amount, to1).send();
if(ObjectUtil.isNotEmpty(send)){
transactionHash = send.getTransactionHash();
@@ -174,7 +180,7 @@
ContractMain contractMain = new ContractMain();
String address = "0xd9076245473060dda1a65f5f3d89a4d0598995e6";
- BigInteger bigInteger = new BigInteger(Convert.toWei("0.0003", Convert.Unit.ETHER).setScale(0).toString());
+ BigInteger bigInteger = new BigInteger(Convert.toWei("0.00105", Convert.Unit.ETHER).setScale(0).toString());
String hash = contractMain.trans(bigInteger,address);
System.out.println(hash);
}
--
Gitblit v1.9.1