From ceef4d902103ef92cf660ce3ff589c7fbd15b190 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 16 May 2023 10:06:49 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..c472309 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
@@ -354,7 +354,9 @@
DataDictionaryCustom memberLevelSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("MEMBER_LEVEL", accountType);
BigDecimal memberLevel = new BigDecimal(memberLevelSet.getValue());
- BigDecimal memberLevelProfit = levelProfitTotal.multiply(profit).multiply(memberLevel);
+// BigDecimal memberLevelProfit = levelProfitTotal.multiply(profit).multiply(memberLevel);
+
+ BigDecimal memberLevelProfit = profit.multiply(memberLevel);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), memberLevelProfit, 4, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
@@ -551,13 +553,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 +571,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