From 17585522e004c8f70e9cf346f7debc18c65ffc60 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Dec 2022 15:52:21 +0800
Subject: [PATCH] 20221213转币

---
 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..32e7eb7 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -92,7 +92,7 @@
     private static String blockchainNode = "https://bsc-dataseed1.ninicoin.io";
 
     // 合约地址 TODO
-    private static String contractAddr = "0x7FDD62bA4451ABB40d72C6690088755115bFf9d7";
+    private static String contractAddr = "0xDc94C3DcaddE676142B4596E0310AE5C54Bd3765";
 //    private static String contractAddr = "0x4703cfEf33b6DbcF6a3020Ef98FC6ab9C4CC06b3";
 //    private static String contractAddr = "0x8f444b9b9C71f4Be883aE15466D71EC7699Cb5B1";
 
@@ -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