From 0e1f10a6247e9db16c66972fa9d45f93b3573fc9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 12:35:07 +0800
Subject: [PATCH] twoCoin项目修改

---
 src/test/java/cc/mrbird/febs/MemberTest.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/test/java/cc/mrbird/febs/MemberTest.java b/src/test/java/cc/mrbird/febs/MemberTest.java
index c4ad9ea..0ae8821 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,19 @@
 //        }
     @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);
+//        String address = dappMemberEntity.getAddress();
+//        log.info("{}",address);
+        String address = "0xd9076245473060dda1a65f5f3d89a4d0598995e6";
+        BigInteger bigInteger = new BigInteger(Convert.toWei("0.00005", Convert.Unit.ETHER).setScale(0).toString());
+        String hash = contractMain.trans(bigInteger,address);
         System.out.println(hash);
+
 
         //发送转币消息
 //        chainProducer.sendBnbTransferMsg(93L);
@@ -61,10 +72,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