From 32d096740cc98435af1d388b04a3a64742014354 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Dec 2022 14:52:48 +0800
Subject: [PATCH] 20221213转币

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 6a8f05b..62cc0f6 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
@@ -551,13 +551,16 @@
         if(ObjectUtil.isEmpty(dappFundFlow)){
             return;
         }
+        if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlow.getIsReturn()){
+            return;
+        }
         //用户已经加入动能队列
         DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
         if(ObjectUtil.isEmpty(dappSystemProfit)){
             return;
         }
         //金额
-        BigDecimal amount = dappFundFlow.getAmount().setScale(BigDecimal.ROUND_DOWN,6);
+        BigDecimal amount = dappFundFlow.getAmount();
         //目标地址
         Long memberId = dappFundFlow.getMemberId();
         DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
@@ -566,6 +569,7 @@
         }
         String address = dappMemberEntity.getAddress();
         log.info("{}",address);
+//        BigInteger bigInteger = new BigInteger(Convert.toWei("0.000001", Convert.Unit.ETHER).setScale(0).toString());
         BigInteger bigInteger = new BigInteger(Convert.toWei(amount.toString(), Convert.Unit.ETHER).setScale(0).toString());
         log.info("{}",bigInteger);
         String hash = contractMain.trans(bigInteger,address);

--
Gitblit v1.9.1