From b7e79b1a0a954a6d15dc45d835e0024b6b51c211 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 06 Jun 2022 16:01:34 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/job/MineProfitJob.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/MineProfitJob.java b/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
index 4fbe21e..684400f 100644
--- a/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/job/MineProfitJob.java
@@ -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) {
@@ -91,7 +91,7 @@
dappWalletMineDao.updateById(walletMine);
// 计算代理返多少
- calAgentMoney(member, ethIncome);
+// calAgentMoney(member, ethIncome);
break;
}
}
@@ -109,7 +109,7 @@
* @param member
* @param amount
*/
- private void calAgentMoney(DappMemberEntity member, BigDecimal amount) {
+ public void calAgentMoney(DappMemberEntity member, BigDecimal amount) {
if (StrUtil.isBlank(member.getRefererIds())) {
return;
}
@@ -118,7 +118,14 @@
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;
}
@@ -159,6 +166,8 @@
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