From 823aabb391a0cbd2eddf7c58c03b76e71967b964 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 22 Jul 2022 11:16:45 +0800
Subject: [PATCH] add contract listner exception

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java |   45 +++++----------------------------------------
 1 files changed, 5 insertions(+), 40 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 76cfc62..d53c186 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
@@ -5,10 +5,7 @@
 import cc.mrbird.febs.common.utils.ShareCodeUtil;
 import cc.mrbird.febs.dapp.chain.*;
 import cc.mrbird.febs.dapp.entity.*;
-import cc.mrbird.febs.dapp.mapper.DappFundFlowDao;
-import cc.mrbird.febs.dapp.mapper.DappMemberDao;
-import cc.mrbird.febs.dapp.mapper.DappOnlineTransferDao;
-import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.dapp.mapper.*;
 import cc.mrbird.febs.dapp.service.DappMemberService;
 import cc.mrbird.febs.dapp.service.DappSystemService;
 import cc.mrbird.febs.dapp.utils.OnlineTransferUtil;
@@ -44,12 +41,10 @@
 
     @Resource
     private ChainProducer chainProducer;
-
     @Resource
     private DappOnlineTransferDao dappOnlineTransferDao;
     @Resource
     private DataDictionaryCustomMapper dataDictionaryCustomMapper;
-
     @Autowired
     private DappSystemService dappSystemService;
 
@@ -62,7 +57,7 @@
 
         redisUtils.set(AppContants.REDIS_KEY_BLOCK_USDT_NUM, e.log.getBlockNumber());
         // 判断对方打款地址是否为源池地址
-        if (ChainEnum.BSC_TFC_SOURCE.getAddress().toLowerCase().equals(e.to)) {
+        if (ChainEnum.BSC_USDT.getAddress().toLowerCase().equals(e.to)) {
             log.info("触发USDT合约监听事件");
             redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, e.log.getBlockNumber());
 
@@ -80,13 +75,9 @@
             }
 
             DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
-            // 如果此时fromMember为null,则说明该用户未经过转账绑定关系,而是直接注册并购买币,则将关系绑定到顶级账户
             if (fromMember == null) {
-                DappMemberEntity toAddress = dappMemberService.findByAddress(e.to, null);
-                fromMember = dappMemberService.insertMember(e.from, toAddress.getInviteId());
+                return;
             }
-
-            String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
 
             BigInteger tokens = e.tokens;
             BigDecimal amount = new BigDecimal(tokens.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
@@ -107,7 +98,7 @@
                 boolean hasFlow = false;
                 for (DappFundFlowEntity flow : flows) {
                     if (flow.getStatus() == 1) {
-                        if (amount.compareTo(flow.getTargetAmount()) == 0) {
+                        if (amount.compareTo(flow.getAmount()) == 0) {
                             hasFlow = true;
                             fundFlow = flow;
                             fundFlow.setFromHash(e.log.getTransactionHash());
@@ -129,33 +120,7 @@
             fundFlow.setTargetAmount(amount);
             dappFundFlowDao.updateById(fundFlow);
 
-            // 如果系统会开启,则使用自动打款
-            if (!"start".equals(hasStart)) {
-                OnlineTransferUtil.addTransfer(e.from, fundFlow.getAmount(), 1, 1, ChainEnum.BSC_TFC_MAKE.name(), "BSC", fundFlow.getId().toString());
-
-                Map<String, String> map = new HashMap<>();
-                map.put("batchNo", fundFlow.getId().toString());
-                map.put("type", "flow");
-
-                // 发送转账消息
-                chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
-            } else {
-                OnlineTransferUtil.addTransfer(e.from, fundFlow.getAmount(), 1, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, fundFlow.getId().toString());
-
-                Map<String, String> map = new HashMap<>();
-                map.put("batchNo", fundFlow.getId().toString());
-                map.put("type", "flow");
-
-                // 发送转账消息
-                chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
-
-                // 发送购买奖励消息
-                chainProducer.sendUserBuyReward(fundFlow.getId());
-            }
+            dappSystemService.idoBuy(fromMember, amount);
         }
-    }
-
-    public static void main(String[] args) {
-        System.out.println(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf("0x9DDE1834683D642D4D077498DC7fbdb8CF70E8FE"));
     }
 }

--
Gitblit v1.9.1