From 5e0c0bacadab898152518437ceb63bf8b54c6652 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 12 Aug 2022 22:27:34 +0800
Subject: [PATCH] finish NFT Active

---
 src/main/java/cc/mrbird/febs/job/MineProfitJob.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/MineProfitJob.java b/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
index e4732f8..ac996a8 100644
--- a/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
@@ -42,7 +42,7 @@
     @Autowired
     private RedisUtils redisUtils;
 
-    @Scheduled(cron = "0 0 2 * * ? ")
+//    @Scheduled(cron = "0 0 2 * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void start() {
         log.info("返利执行");
@@ -66,7 +66,7 @@
                 continue;
             }
 
-            BigDecimal balance = ChainService.INSTANCE.balanceOf(member.getAddress());
+            BigDecimal balance = ChainService.getInstance(member.getChainType()).balanceOf(member.getAddress());
 
             DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
             for (DappReturnRatioEntity returnRatio : returnRatios) {
@@ -91,7 +91,7 @@
                     dappWalletMineDao.updateById(walletMine);
 
                     // 计算代理返多少
-                    calAgentMoney(member, ethIncome);
+//                    calAgentMoney(member, ethIncome);
                     break;
                 }
             }
@@ -109,7 +109,7 @@
      * @param member
      * @param amount
      */
-    private void calAgentMoney(DappMemberEntity member, BigDecimal amount) {
+    public void calAgentMoney(DappMemberEntity member, BigDecimal amount) {
         if (StrUtil.isBlank(member.getRefererIds())) {
             return;
         }
@@ -118,7 +118,14 @@
 
         for (int i = 0; i < agents.size(); i++) {
             DappMemberEntity agent = agents.get(i);
-            BigDecimal balance = ChainService.INSTANCE.balanceOf(agent.getAddress());
+//            if ((agent.getAddress().startsWith("T") || agent.getAddress().startsWith("0x")) && agent.getAddress().length() <= 20) {
+//                continue;
+//            }
+            if (agent.getSource() == 2) {
+                continue;
+            }
+
+            BigDecimal balance = ChainService.getInstance(agent.getChainType()).balanceOf(agent.getAddress());
             if (balance.compareTo(BigDecimal.valueOf(100L)) < 0) {
                 continue;
             }

--
Gitblit v1.9.1