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 |    6 +++---
 src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java              |   30 +++++++++++++++---------------
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |    8 ++++----
 3 files changed, 22 insertions(+), 22 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..02a09b8 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -132,20 +132,20 @@
                 // 更新区块编号 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();
             }
@@ -174,7 +174,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.00105000", Convert.Unit.ETHER).setScale(0).toString());
         String hash = contractMain.trans(bigInteger,address);
         System.out.println(hash);
     }
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 e7e3764..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
@@ -359,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);
             }
         }
@@ -369,7 +369,7 @@
             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());
@@ -423,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());
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 672f6f7..ae6f35b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -257,7 +257,7 @@
                 DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
                 dappFundFlowDao.insert(systemProfitFlow);
                 //发送转币消息
-//                chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
+                chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
                 //直接返利30%给直接上级
                 DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
                 String refererId = dappMemberEntity.getRefererId();
@@ -271,7 +271,7 @@
                 DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
                 dappFundFlowDao.insert(fundFlow);
                 //发送转币消息
-//                chainProducer.sendBnbTransferMsg(fundFlow.getId());
+                chainProducer.sendBnbTransferMsg(fundFlow.getId());
                 //层级奖励30%
                 chainProducer.sendLevelProfitMsg(dappSystemProfit.getId());
                 //发送一个消息,计算当前是否有人可以出局
@@ -476,7 +476,7 @@
             DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
             dappFundFlowDao.insert(systemProfitFlow);
             //发送转币消息
-//            chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
+            chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
             //直接返利30%给直接上级
             DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
             String refererId = dappMemberEntity.getRefererId();
@@ -489,7 +489,7 @@
             DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
             dappFundFlowDao.insert(fundFlow);
             //发送转币消息
-//            chainProducer.sendBnbTransferMsg(fundFlow.getId());
+            chainProducer.sendBnbTransferMsg(fundFlow.getId());
             //层级奖励30%
             chainProducer.sendLevelProfitMsg(dappSystemProfit.getId());
             //发送一个消息,计算当前是否有人可以出局

--
Gitblit v1.9.1