From d97770d801ec27723637399644206ed858189fcd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Dec 2022 17:05:36 +0800
Subject: [PATCH] 20221213转币

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 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 e6999fc..79715fa 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
@@ -6,6 +6,7 @@
 import cc.mrbird.febs.common.utils.SpringContextUtil;
 import cc.mrbird.febs.dapp.chain.ChainEnum;
 import cc.mrbird.febs.dapp.chain.ChainService;
+import cc.mrbird.febs.dapp.contract.ContractMain;
 import cc.mrbird.febs.dapp.dto.SystemDto;
 import cc.mrbird.febs.dapp.dto.TransferDto;
 import cc.mrbird.febs.dapp.entity.*;
@@ -30,6 +31,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.util.*;
 
@@ -53,6 +55,7 @@
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
     private final DappSystemProfitDao dappSystemProfitDao;
     private final ChainProducer chainProducer;
+    private final ContractMain contractMain;
 
 
     @Override
@@ -544,12 +547,12 @@
     @Override
     public void bnbTransferTest(Long id) {
         DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+        if(ObjectUtil.isEmpty(dappFundFlow)){
+            return;
+        }
         //用户已经加入动能队列
         DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
         if(ObjectUtil.isEmpty(dappSystemProfit)){
-            return;
-        }
-        if(ObjectUtil.isEmpty(dappFundFlow)){
             return;
         }
         //金额
@@ -562,7 +565,7 @@
         }
         String address = dappMemberEntity.getAddress();
         log.info("{}",address);
-        String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
+        String hash = contractMain.trans(new BigInteger(amount.toString()),address);
         if(StrUtil.isEmpty(hash)){
             return;
         }

--
Gitblit v1.9.1