From 83f2d67e5085b052fa6e2e4b0f29a1cbc0a638f7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 17:56:11 +0800
Subject: [PATCH] twoCoin项目修改

---
 src/test/java/cc/mrbird/febs/MemberTest.java |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/test/java/cc/mrbird/febs/MemberTest.java b/src/test/java/cc/mrbird/febs/MemberTest.java
index c4ad9ea..a73ebc2 100644
--- a/src/test/java/cc/mrbird/febs/MemberTest.java
+++ b/src/test/java/cc/mrbird/febs/MemberTest.java
@@ -1,22 +1,26 @@
 package cc.mrbird.febs;
 
 import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.contants.SystemConstants;
 import cc.mrbird.febs.dapp.chain.ChainEnum;
 import cc.mrbird.febs.dapp.chain.ChainService;
-import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
+import cc.mrbird.febs.dapp.contract.ContractMain;
 import cc.mrbird.febs.dapp.entity.DappMemberEntity;
 import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
 import cc.mrbird.febs.dapp.mapper.DappFundFlowDao;
 import cc.mrbird.febs.dapp.mapper.DappMemberDao;
 import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.dapp.service.DappSystemService;
 import cc.mrbird.febs.rabbit.producer.ChainProducer;
 import cn.hutool.core.util.StrUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.web3j.utils.Convert;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.List;
 
 /**
@@ -36,6 +40,9 @@
     private DappFundFlowDao dappFundFlowDao;
 
     @Autowired
+    private ContractMain contractMain;
+
+    @Autowired
     private ChainProducer chainProducer;
     //        String address = dappMemberEntity.getAddress();
 //        String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
@@ -44,15 +51,25 @@
 //        }
     @Test
     public void tranfer(){
-        String address = "0xd9076245473060dda1a65f5f3d89a4d0598995e6";
-        BigDecimal amount = new BigDecimal("0.00005000");
-        String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
+//        String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
 ////        if(StrUtil.isEmpty(hash)){
 ////            return;
 ////        }
-//        BigDecimal balance = ChainService.getInstance(ChainEnum.WBNB.name()).balanceOf(ChainEnum.WBNB.getAddress());
-//        Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,464L);
-        System.out.println(hash);
+//        BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT.getAddress());
+////        Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,464L);
+////        String address = dappMemberEntity.getAddress();
+////        log.info("{}",address);
+//        System.out.println(balance);
+
+        ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(AppContants.ADDRESS_PEOJECT, new BigDecimal(0.1));
+        try {
+            Thread.sleep(10000);
+        } catch (InterruptedException ex) {
+            ex.printStackTrace();
+        }
+
+        ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(AppContants.ADDRESS_PEOJECT, new BigDecimal(0.1));
+
 
         //发送转币消息
 //        chainProducer.sendBnbTransferMsg(93L);
@@ -61,10 +78,17 @@
 //        chainProducer.sendBnbTransferMsg(96L);
     }
 
+
+    @Autowired
+    private SystemConstants systemConstants;
+    @Autowired
+    private DappSystemService dappSystemService;
     @Test
     public void balance() {
-        BigDecimal hash = ChainService.getInstance(ChainEnum.BNB.name()).balanceOfBaseToken(ChainEnum.BNB.getAddress());
-        System.out.println(hash);
+        /**
+         * 从contractAddress合约地址中转移对应发行的代币到address中
+         */
+        dappSystemService.bnbTransfer(6L);
     }
 
     @Test

--
Gitblit v1.9.1