From 22819e7b84e661b65b43b8a3c8467080b1b23fa4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 15:32:48 +0800
Subject: [PATCH] 20221130

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 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 0dcfa95..65ec96e 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
@@ -463,18 +463,21 @@
             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){
+            DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+            //金额
+            BigDecimal amount = dappFundFlow.getAmount();
+            //目标地址
+            String address = dappFundFlow.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);
+            dappFundFlow.setFromHash(hash);
+            dappFundFlowDao.updateById(dappFundFlow);
+        }
     }
 
     @Override
@@ -506,6 +509,25 @@
         }
     }
 
+    @Override
+    public void bnbTransferTest(Long id) {
+        DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+        if(ObjectUtil.isEmpty(dappFundFlow)){
+            return;
+        }
+        //金额
+        BigDecimal amount = dappFundFlow.getAmount();
+        //目标地址
+        String address = dappFundFlow.getAddress();
+        String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
+        if(StrUtil.isEmpty(hash)){
+            return;
+        }
+        log.info("{},{}",id,hash);
+        dappFundFlow.setFromHash(hash);
+        dappFundFlowDao.updateById(dappFundFlow);
+    }
+
     public static void main(String[] args) {
         String refererIds = "1,2,3,4,5," +
                             "6,7,8,9,10," +

--
Gitblit v1.9.1