From 18aab7d6156b93d65c1b18809d924cbb214d737a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:04:03 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
index 679c443..42367ee 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/TrxUsdtUpdateService.java
@@ -25,6 +25,9 @@
import java.math.BigInteger;
import java.util.*;
+/**
+ * TRX TRC20服务类
+ */
@Service
public class TrxUsdtUpdateService {
@@ -32,6 +35,11 @@
private static String http = "https://api.trongrid.io";
private static String TRC20_CONTRACT_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
+
+ /**
+ * 手续费
+ */
+ private final static BigDecimal TRX_FEE = new BigDecimal("10");
@Resource
private UsdtUpdateProducer usdtUpdateProducer;
@@ -42,6 +50,9 @@
@Resource
RedisUtils redisUtils;
+ /**
+ * 扫块 同步充值USDT-TRC20和TRX
+ */
public void monitorCoinListener() {
if (CollectionUtils.isEmpty(addressList)) {
List<MemberCoinAddressEntity> coinAddressList = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.USDT.name(), "TRC20");
@@ -51,6 +62,7 @@
});
}
}
+ // 扫块区块
Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
if(trc20BlockNum==null){
trc20BlockNum = 27805917L;
@@ -63,13 +75,16 @@
}
- // http 请求
- // httpTransactionInfo(addressList, 26599313L);
- //httpTransactionInfo(addressList, 26603621L);
+ // 解析区块
httpTransactionInfo(addressList, blockNum);
redisUtils.set("USDT_TRC20_BLOCK_NUM", (blockNum + 1L));
}
+ /**
+ * 解析区块数据 同步用户充值
+ * @param addressList
+ * @param num
+ */
private void httpTransactionInfo(List<String> addressList, Long num) {
String transactionInfoByBlockNum = getTransactionInfoByBlockNum(BigInteger.valueOf(num));
if (StringUtils.isBlank(transactionInfoByBlockNum)) {
@@ -103,6 +118,10 @@
}
+ /**
+ * 比对本地地址 同步TRX充值
+ * @param parseObject
+ */
private void transferContract(JSONObject parseObject) {
//数量
BigDecimal amount = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getBigDecimal("amount");
@@ -167,6 +186,12 @@
return result;
}
+ /**
+ * 比对本地地址 同步充值USDT-TRC20
+ * @param addressList
+ * @param txId
+ * @param parseObject
+ */
private void triggerSmartContract(List<String> addressList, String txId, JSONObject parseObject) {
//方法参数
String data = parseObject.getJSONObject("raw_data").getJSONArray("contract").getJSONObject(0).getJSONObject("parameter").getJSONObject("value").getString("data");
@@ -223,13 +248,18 @@
}
+ /**
+ * 根据地址归集USDT-TRC20
+ * @param address
+ * @return
+ */
public boolean poolByAddress(String address) {
// 首先查询trx余额
BigDecimal trxBalance = Trc20Service.getTrxBalance(address);
if (trxBalance == null) {
return false;
}
- if (trxBalance.compareTo(new BigDecimal(1)) >= 0) {
+ if (trxBalance.compareTo(TRX_FEE) >= 0) {
// 转
BigDecimal trc20Balance = Trc20Service.getTrc20Balance(address);
if (trc20Balance == null) {
@@ -259,7 +289,7 @@
}
return true;
} else {
- Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY, address, new BigDecimal(1));
+ Trc20Service.sendTrx(Trc20Service.TRX_PRIVATE_KEY, address, TRX_FEE);
// 将这个地址记录，后续同步
Object trc20_pool = redisUtils.get("TRC20_POOL");
List<String> poolList = new ArrayList<>();
--
Gitblit v1.9.1