From 0bb629f780f01bde04db7d8c5af25b23a1e05472 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 07 Jun 2024 13:07:11 +0800
Subject: [PATCH] 将监听充值新建一个项目

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 00513c8..366617b 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
@@ -1,6 +1,5 @@
 package cc.mrbird.febs.dapp.service.impl;
 
-import cc.mrbird.febs.common.contants.AppContants;
 import cc.mrbird.febs.common.utils.RedisUtils;
 import cc.mrbird.febs.dapp.chain.*;
 import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
@@ -137,11 +136,11 @@
             return;
         }
 
-        redisUtils.set(AppContants.REDIS_KEY_BLOCK_USDT_NUM, e.log.getBlockNumber());
+//        redisUtils.set(AppContants.REDIS_KEY_BLOCK_USDT_NUM, e.log.getBlockNumber());
         // 判断对方打款地址是否为源池地址
         if (ChainEnum.BSC_USDT.getAddress().toLowerCase().equals(e.to)) {
 
-            redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, e.log.getBlockNumber());
+//            redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, e.log.getBlockNumber());
 
             // 如果得到触发,则休眠10秒。 因为此处监听器触发可能优先于前端调用transfer接口
 //            try {
@@ -155,11 +154,16 @@
             if (e.from.equals("0xaa25aa7a19f9c426e07dee59b12f944f4d9f1dd3")) {
                 return;
             }
+            String fromAddress = e.from;
+            DappMemberEntity fromMember = dappMemberDao.selectByAddress(fromAddress, null);
+            if(ObjectUtil.isEmpty(fromMember)){
+                return;
+            }
 
             BigInteger tokens = e.tokens;
             BigDecimal amount = new BigDecimal(tokens.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
 
-            DappFundFlowEntity fundFlow = dappFundFlowDao.selectByFromHash(e.log.getTransactionHash(), null);
+            DappFundFlowEntity fundFlow = dappFundFlowDao.selectByFromHashAndAndMemberId(e.log.getTransactionHash(), null,fromMember.getId());
             if(ObjectUtil.isNotEmpty(fundFlow) && 1 == fundFlow.getStatus()){
                 log.info("触发USDT合约监听事件-买入贡献值,金额:{}",amount);
                 if(1 == fundFlow.getType()){//认购贡献值 1
@@ -186,7 +190,7 @@
                         return;
                     }
 
-                    fundFlow.setAmount(fundFlow.getAmount().negate());
+//                    fundFlow.setAmount(fundFlow.getAmount().negate());
                     // 更改状态为已同步
                     fundFlow.setStatus(2);
                     dappFundFlowDao.updateById(fundFlow);
@@ -198,7 +202,7 @@
                 }else if(13 == fundFlow.getType()){//认购节点 13
 
                     log.info("触发USDT合约监听事件-认购节点,金额:{}",amount);
-                    fundFlow.setAmount(fundFlow.getAmount().negate());
+//                    fundFlow.setAmount(fundFlow.getAmount().negate());
                     // 更改状态为已同步
                     fundFlow.setStatus(2);
                     dappFundFlowDao.updateById(fundFlow);

--
Gitblit v1.9.1