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

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |    4 +++-
 src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java              |    4 +++-
 2 files changed, 6 insertions(+), 2 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 9547fc4..1c666ce 100644
--- a/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
+++ b/src/main/java/cc/mrbird/febs/dapp/contract/ContractMain.java
@@ -142,7 +142,9 @@
         Abi contract = Abi.load(contractAddr, getInstance(), credentials, getStaticGasProvider());
         try {
             TransactionReceipt send = contract.trans(amount, to1).send();
-            transactionHash = send.getTransactionHash();
+            if(ObjectUtil.isNotEmpty(send)){
+                transactionHash = send.getTransactionHash();
+            }
         } catch (Exception exception) {
             exception.printStackTrace();
         }
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 79715fa..36a9c34 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
@@ -29,6 +29,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.web3j.utils.Convert;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -565,7 +566,8 @@
         }
         String address = dappMemberEntity.getAddress();
         log.info("{}",address);
-        String hash = contractMain.trans(new BigInteger(amount.toString()),address);
+        BigInteger bigInteger = new BigInteger(Convert.toWei(amount.toString(), Convert.Unit.ETHER).setScale(0).toString());
+        String hash = contractMain.trans(bigInteger,address);
         if(StrUtil.isEmpty(hash)){
             return;
         }

--
Gitblit v1.9.1