From fed58c8b88dc71ea5a5fa1cf1b5527f0b4555089 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Jun 2021 16:11:09 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java | 107 ++++++++++++++++++-----------------------------------
1 files changed, 36 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
index 0dcf023..253d02e 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
@@ -411,77 +411,42 @@
}
@Override
- public void updateTrc20() {
- // 首先去查redis上的上次同步时间
- Object lastUpdateTime = redisUtils.get(trc20_update_key);
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
- String start = null;
- if (lastUpdateTime == null) {
- // 没有 说明是第一次同步 此时从第一天开始同步2020 0905开始
- start = "2020-09-05'T'00:00";
- } else {
- // 有上次时间
- start = lastUpdateTime.toString();
- }
-
- // 去查询上次同步时间后的所有记录
- //Trc20Service.getAddressTransactions()
- // 写入本次更新时间
- String updateTime = format.format(new Date());
- redisUtils.set(trc20_update_key, updateTime);
+ public void updateTrc20(EthUsdtChargeDto dto) {
+ String address = dto.getAddress();
+ BigDecimal amount = dto.getBalance();
+ String hash = dto.getHash();
// 判断有无
- List<MemberCoinAddressEntity> addressList = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.USDT.name(), "TRC20");
- if (CollectionUtils.isNotEmpty(addressList)) {
- Map<String, Object> hashParam = new HashMap<>();
- for (MemberCoinAddressEntity coinAddressEntity : addressList) {
- String address = coinAddressEntity.getAddress();
- List<Trc20TransactionsData> addressTransactions = Trc20Service.getAddressTransactions(address, start);
- if (CollectionUtils.isNotEmpty(addressTransactions)) {
- for (Trc20TransactionsData trc20TransactionsData : addressTransactions) {
- String transactionId = trc20TransactionsData.getTransaction_id();
- String value = trc20TransactionsData.getValue();
- // 本次转账金额
- BigDecimal amount = new BigDecimal(value).divide(new BigDecimal("1000000"));
- // 校验token是否为trc20USD
- if (trc20TransactionsData.getToken_info() != null && trc20TransactionsData.getToken_info().containsKey("address")) {
- String tokenTrc = trc20TransactionsData.getToken_info().get("address").toString();
- if (!"TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t".equals(tokenTrc)) {
- continue;
- }
- } else {
- continue;
- }
- // 校验hash是否已同步过
- hashParam.put("hash", transactionId);
- List<MemberCoinChargeEntity> memberCoinChargeEntities = memberCoinChargeDao.selectByMap(hashParam);
- if (CollectionUtils.isNotEmpty(memberCoinChargeEntities)) {
- // 若已同步过
- continue;
- }
- // 添加钱包余额
- // 用户ID
- Long memberId = coinAddressEntity.getMemberId();
- MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.USDT.name());
-
- memberWalletCoinDao.updateBlockBalance(memberWalletCoinEntity.getId(), amount, BigDecimal.ZERO, 0);
- // 添加冲币记录
- String orderNo = insertCoinCharge(address, memberId, amount, CoinTypeEnum.USDT.name(), "TRC20", BigDecimal.ZERO, transactionId);
- LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.USDT.name(), 1, 1);
-
- ThreadPoolUtils.sendDingTalk(5);
- MemberEntity member = memberDao.selectById(memberId);
- if (StrUtil.isNotBlank(member.getPhone())) {
- //String amountEos = amount + "XRP";
- Sms106Send.sendRechargeMsg(member.getPhone(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
- } else {
- SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
- }
-
- }
- }
- }
+ //List<MemberCoinAddressEntity> addressList = memberCoinAddressDao.selectAllBlockAddressBySymbolAndTag(CoinTypeEnum.USDT.name(), "TRC20");
+ Map<String, Object> hashParam = new HashMap<>();
+ // 校验hash是否已同步过
+ hashParam.put("hash", hash);
+ List<MemberCoinChargeEntity> memberCoinChargeEntities = memberCoinChargeDao.selectByMap(hashParam);
+ if (CollectionUtils.isNotEmpty(memberCoinChargeEntities)) {
+ // 若已同步过
+ return;
}
+ // 添加钱包余额
+ // 用户ID
+ MemberCoinAddressEntity memberCoinAddress = memberCoinAddressDao.selectCoinAddressByAddressAndSymbolTag(address, CoinTypeEnum.USDT.name(),"TRC20");
+ if (memberCoinAddress == null) {
+ return;
+ }
+ Long memberId = memberCoinAddress.getMemberId();
+ // 查询钱包 并更新
+ MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.USDT.name());
+ memberWalletCoinDao.updateBlockBalance(memberWalletCoinEntity.getId(), amount, BigDecimal.ZERO, 0);
+ // 添加冲币记录
+ String orderNo = insertCoinCharge(address, memberId, amount, CoinTypeEnum.USDT.name(), "TRC20", BigDecimal.ZERO, hash);
+// LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.USDT.name(), 1, 1);
+ ThreadPoolUtils.sendDingTalk(5);
+ MemberEntity member = memberDao.selectById(memberId);
+ if (StrUtil.isNotBlank(member.getPhone())) {
+ //String amountEos = amount + "XRP";
+// Sms106Send.sendRechargeMsg(member.getPhone(), new Date(), amount+"U", orderNo);
+ } else {
+ SubMailSend.sendRechargeMail(member.getEmail(), DateUtil.format(new Date(), DatePattern.NORM_DATETIME_MINUTE_PATTERN), orderNo);
+ }
}
@Override
@@ -505,7 +470,7 @@
}
Long memberId = memberCoinAddress.getMemberId();
// 查询钱包 并更新
- MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.GBZ.name());
+ MemberWalletCoinEntity walletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.BZZ.name());
if (walletCoinEntity == null) {
// 创建一个钱包
// 创建这个钱包
@@ -521,9 +486,9 @@
memberWalletCoinDao.updateBlockBalance(walletCoinEntity.getId(), balance, BigDecimal.ZERO, 0);
- String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.GBZ.name(), "", BigDecimal.ZERO, null);
+ String orderNo = insertCoinCharge(address, memberId, balance, CoinTypeEnum.BZZ.name(), "", BigDecimal.ZERO, null);
// 插入财务记录
- LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.GBZ.name(), 1, 1);
+ LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", balance, CoinTypeEnum.BZZ.name(), 1, 1);
try {
ThreadPoolUtils.sendDingTalk(5);
--
Gitblit v1.9.1