From 05d0f9270936df6eb6af19bc3ee7f5ec42acf0df Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 30 Jul 2022 23:43:30 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/job/MineProfitJob.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/MineProfitJob.java b/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
index 5ecd209..82c4930 100644
--- a/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
@@ -20,7 +20,7 @@
import java.util.*;
/**
- * @author wzy
+ * @author
* @date 2022-03-28
**/
@Slf4j
@@ -66,7 +66,7 @@
continue;
}
- BigDecimal balance = ChainService.INSTANCE.balanceOf(member.getAddress());
+ BigDecimal balance = ChainService.getInstance(member.getChainType()).balanceOf(member.getAddress());
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
for (DappReturnRatioEntity returnRatio : returnRatios) {
@@ -109,16 +109,23 @@
* @param member
* @param amount
*/
- private void calAgentMoney(DappMemberEntity member, BigDecimal amount) {
+ public void calAgentMoney(DappMemberEntity member, BigDecimal amount) {
if (StrUtil.isBlank(member.getRefererIds())) {
return;
}
- List<DappMemberEntity> agents = dappMemberDao.selectAgentMemberList(StrUtil.split(member.getRefererIds(), ','), 5);
+ List<DappMemberEntity> agents = dappMemberDao.selectParentsList(StrUtil.split(member.getRefererIds(), ','), 5);
for (int i = 0; i < agents.size(); i++) {
DappMemberEntity agent = agents.get(i);
- BigDecimal balance = ChainService.INSTANCE.balanceOf(agent.getAddress());
+// if ((agent.getAddress().startsWith("T") || agent.getAddress().startsWith("0x")) && agent.getAddress().length() <= 20) {
+// continue;
+// }
+ if (agent.getSource() == 2) {
+ continue;
+ }
+
+ BigDecimal balance = ChainService.getInstance(agent.getChainType()).balanceOf(agent.getAddress());
if (balance.compareTo(BigDecimal.valueOf(100L)) < 0) {
continue;
}
@@ -156,9 +163,11 @@
DappFundFlowEntity fundFlow = new DappFundFlowEntity(agent.getId(), returnMoney, 4, null, null);
dappFundFlowDao.insert(fundFlow);
- String content = "代理返利:" + returnMoney.toPlainString();
+ String content = "邀请返利:" + returnMoney.toPlainString();
DappAccountMoneyChangeEntity accountMoneyChange = new DappAccountMoneyChangeEntity(agent.getId(), walletMine.getAvailableAmount(), returnMoney, walletMine.getAvailableAmount().add(returnMoney), content, 4);
dappAccountMoneyChangeDao.insert(accountMoneyChange);
+
+ dappAgentReturnFlowDao.updateIsReturnByMemberId(1, agent.getId());
}
}
}
--
Gitblit v1.9.1