From 3468c100b9ef9747f5202c412a4ecbd4789d8a5d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 31 Oct 2022 22:37:08 +0800
Subject: [PATCH] fix
---
lib/client-0.4.0.jar | 0
lib/utils-0.4.0.jar | 0
src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java | 9 +++++----
src/test/java/cc/mrbird/febs/ChainTest.java | 9 +++++++++
lib/abi-0.4.0.jar | 0
src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java | 2 +-
pom.xml | 25 ++++++++++++++++++++++++-
7 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/lib/abi-0.4.0.jar b/lib/abi-0.4.0.jar
new file mode 100644
index 0000000..cf65d8d
--- /dev/null
+++ b/lib/abi-0.4.0.jar
Binary files differ
diff --git a/lib/client-0.4.0.jar b/lib/client-0.4.0.jar
new file mode 100644
index 0000000..4785a17
--- /dev/null
+++ b/lib/client-0.4.0.jar
Binary files differ
diff --git a/lib/utils-0.4.0.jar b/lib/utils-0.4.0.jar
new file mode 100644
index 0000000..a8175ab
--- /dev/null
+++ b/lib/utils-0.4.0.jar
Binary files differ
diff --git a/pom.xml b/pom.xml
index ec1ab2f..556e349 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
</properties>
<dependencies>
-
<dependency>
<groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
@@ -348,6 +347,30 @@
<systemPath>${basedir}/lib/core-0.3.0.jar</systemPath>
</dependency>
+
+ <dependency>
+ <groupId>com.github.ki5fpl.tronj</groupId>
+ <artifactId>abi</artifactId>
+ <version>0.4.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/abi-0.4.0.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.github.ki5fpl.tronj</groupId>
+ <artifactId>client</artifactId>
+ <version>0.4.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/client-0.4.0.jar</systemPath>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.ki5fpl.tronj</groupId>
+ <artifactId>utils</artifactId>
+ <version>0.4.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/utils-0.4.0.jar</systemPath>
+ </dependency>
+
<dependency>
<groupId>ztron-sdk</groupId>
<artifactId>ztron-sdk</artifactId>
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java b/src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java
index e27cee0..869b1d7 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/Trc20Service.java
@@ -25,7 +25,7 @@
public final static String TRX_ADDRESS = "TEYXcnHQfcGGGQ1zdcdx9aMbWUf3vBFj1k";
public final static String POOL_ADDRESS = "TZ4LNanau13XFDZGiXiVmamTKn6q8jawiB";
- public final static String API_KEY="a7b0c96a-cfcd-474d-88c5-75c6277fedbf";
+ public final static String API_KEY="9d461be6-9796-47b9-85d8-b150cbabbb54";
/**
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java b/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java
index 0a0cbab..d63254b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java
@@ -288,6 +288,11 @@
* @return
*/
public boolean poolByAddress(String address) {
+ BigDecimal trc20Balance = Trc20Service.getTrc20Balance(address);
+ if (trc20Balance == null) {
+ return false;
+ }
+
// 首先查询trx余额
BigDecimal trxBalance = Trc20Service.getTrxBalance(address);
if (trxBalance == null) {
@@ -295,10 +300,6 @@
}
if (trxBalance.compareTo(TRX_FEE) >= 0) {
// 转
- BigDecimal trc20Balance = Trc20Service.getTrc20Balance(address);
- if (trc20Balance == null) {
- return false;
- }
MemberCoinAddressEntity coinAddressEntity = memberCoinAddressDao.selectCoinAddressByAddressAndSymbolTag(address, "USDT", "TRC20");
if (coinAddressEntity == null) {
return false;
diff --git a/src/test/java/cc/mrbird/febs/ChainTest.java b/src/test/java/cc/mrbird/febs/ChainTest.java
index 105c2fe..5c8a887 100644
--- a/src/test/java/cc/mrbird/febs/ChainTest.java
+++ b/src/test/java/cc/mrbird/febs/ChainTest.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.chain.ContractChainService;
+import cc.mrbird.febs.dapp.chain.TrxUsdtUpdateService;
import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
import cc.mrbird.febs.dapp.entity.DappOnlineTransferEntity;
import cc.mrbird.febs.dapp.enumerate.CardPeriod;
@@ -172,4 +173,12 @@
// public void wssTest() {
// ChainService.wssContractEventListener(new BigInteger("20888825"), bscUsdtContractEvent, ChainEnum.BSC_USDT_LISTENER.name());
// }
+
+ @Autowired
+ TrxUsdtUpdateService trxUsdtUpdateService;
+
+ @Test
+ public void poolByAddressTest() {
+ trxUsdtUpdateService.poolByAddress("TNmohnmZLqrPWNqT98CA8ZgmRdhMzSa4Z6");
+ }
}
--
Gitblit v1.9.1