From 5ee43b4308bd377e0073af6268a21a1641365867 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 06 Sep 2022 23:31:56 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
index 3b81d20..b086a9f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
@@ -63,7 +63,7 @@
redisUtils.set(AppContants.REDIS_KEY_BLOCK_USDT_NUM, e.log.getBlockNumber());
// 判断对方打款地址是否为源池地址
if (ChainEnum.BSC_TFC_SOURCE.getAddress().toLowerCase().equals(e.to)) {
- log.info("触发USDT合约监听事件");
+ log.info("触发USDT合约监听事件:{}", e.from);
redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, e.log.getBlockNumber());
// 如果得到触发，则休眠10秒。 因为此处监听器触发可能优先于前端调用transfer接口
@@ -173,8 +173,15 @@
}
if ("0x0f71bff5d92cf9de27b711e5a6b888648e5ff6cc".toLowerCase().equals(e.to)) {
- log.info("触发USDT合约监听事件");
+ log.info("触发卡牌USDT合约监听事件:{}", e.from);
redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, e.log.getBlockNumber());
+
+ // 如果得到触发，则休眠10秒。 因为此处监听器触发可能优先于前端调用transfer接口
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException ex) {
+ ex.printStackTrace();
+ }
ContractChainService sourceUsdtInstance = ChainService.getInstance(ChainEnum.BSC_USDT.name());
int decimals = sourceUsdtInstance.decimals();
@@ -187,23 +194,23 @@
DappFundFlowEntity finalFundFlow = fundFlow;
DappMemberEntity member = dappMemberService.getById(fundFlow.getMemberId());
- new Thread(() -> {
+
+ int count = finalFundFlow.getAmount().intValue();
+ String token = null;
+ while (count > 0) {
+ token = ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
+ log.info("激活卡牌:{}", token);
try {
- int count = finalFundFlow.getAmount().intValue();
- String token = null;
- while (count > 0) {
- token = ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
- Thread.sleep(5000);
- count--;
- }
- finalFundFlow.setStatus(2);
- finalFundFlow.setToHash(token);
- dappFundFlowDao.updateById(finalFundFlow);
- } catch (Exception ex) {
+ Thread.sleep(5000);
+ } catch (InterruptedException ex) {
ex.printStackTrace();
- log.error("发放卡牌错误", ex);
}
- }).start();
+
+ count--;
+ }
+ finalFundFlow.setStatus(2);
+ finalFundFlow.setToHash(token);
+ dappFundFlowDao.updateById(finalFundFlow);
ChainService.getInstance(ChainEnum.BSC_TFC.name()).transfer(AppContants.DESTROY_ADDRESS, finalFundFlow.getTargetAmount());
return;
--
Gitblit v1.9.1