From 46e20ff02e0cd73c739087dd8c08e3bfdc4c9ad4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 17:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
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