From a241055c2dc4ffd0b46a5e50b5c3b4666fc27cf1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 03 Nov 2022 10:33:24 +0800
Subject: [PATCH] Merge branch 'IGT-dev' of http://120.27.238.55:7000/r/sys-dapp into IGT-dev

---
 src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java |   28 ++++------------------------
 1 files changed, 4 insertions(+), 24 deletions(-)

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 d0bfbb1..ee5722e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/TrxUsdtUpdateService.java
@@ -289,7 +289,8 @@
      */
     public boolean poolByAddress(String address) {
         BigDecimal trc20Balance = Trc20Service.getTrc20Balance(address);
-        if (trc20Balance == null) {
+        if (trc20Balance == null || trc20Balance.compareTo(new BigDecimal("0.05")) < 1) {
+            redisUtils.setRemove(ChainConstants.REDIS_KEY_POOL_ADDRESS, address);
             return false;
         }
 
@@ -306,33 +307,12 @@
             }
             Trc20Service.sendTrc20(coinAddressEntity.getPrivateKey(), Trc20Service.POOL_ADDRESS, trc20Balance);
             // 需要将存在redis的待归集地址删除
-            Object trc20_pool = redisUtils.get("TRC20_POOL");
-            if (trc20_pool != null) {
-                List<String> poolList = (List) trc20_pool;
-                Iterator<String> iterator = poolList.iterator();
-                while (iterator.hasNext()) {
-                    String next = iterator.next();
-                    if (address.equals(next)) {
-                        iterator.remove();
-                    }
-                }
-                if (CollectionUtils.isEmpty(poolList)) {
-                    redisUtils.del("TRC20_POOL");
-                } else {
-                    redisUtils.set("TRC20_POOL", poolList);
-                }
-            }
+            redisUtils.setRemove(ChainConstants.REDIS_KEY_POOL_ADDRESS, address);
             return true;
         } else {
             Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY, address, TRX_FEE);
             // 将这个地址记录,后续同步
-            Object trc20_pool = redisUtils.get("TRC20_POOL");
-            List<String> poolList = new ArrayList<>();
-            if (trc20_pool != null) {
-                poolList = (List) trc20_pool;
-            }
-            poolList.add(address);
-            redisUtils.set("TRC20_POOL", poolList);
+            redisUtils.sSet(ChainConstants.REDIS_KEY_POOL_ADDRESS, address);
             return true;
         }
     }

--
Gitblit v1.9.1