From 5c50761c2d0119e6e07ec92bfbef688a9c3e13a2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 12:37:44 +0800
Subject: [PATCH] 20221130

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 8e9c1c0..73ef1ed 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -340,7 +340,7 @@
                 QueryWrapper<DappMemberEntity> objectQueryWrapper = new QueryWrapper<>();
                 objectQueryWrapper.eq("referer_id",refererMember.getInviteId());
                 Integer selectCount = dappMemberDao.selectCount(objectQueryWrapper);
-                if(i > selectCount){
+                if(i >= selectCount){
                     continue;
                 }
                 //获取对应层级奖励
@@ -463,18 +463,20 @@
             return;
         }
         Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,dappFundFlowEntity.getId());
-//        if(count > 0){
-//        //金额
-//        BigDecimal amount = dappFundFlowEntity.getAmount();
-//        //目标地址
-//        String address = dappMemberEntity.getAddress();
-//        String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
-//        if(StrUtil.isEmpty(hash)){
-//            return;
-//        }
-//        dappFundFlowEntity.setToHash(hash);
-//        dappFundFlowDao.updateById(dappFundFlowEntity);
-//        }
+        if(count > 0){
+            //金额
+            BigDecimal amount = dappFundFlowEntity.getAmount();
+            //目标地址
+            String address = dappMemberEntity.getAddress();
+    //        String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
+            String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
+            if(StrUtil.isEmpty(hash)){
+                return;
+            }
+            log.info("{},{}",id,hash);
+            dappFundFlowEntity.setFromHash(hash);
+            dappFundFlowDao.updateById(dappFundFlowEntity);
+        }
     }
 
     @Override

--
Gitblit v1.9.1