From 7a2f69e4cf9771c9450b009ea5deaaa07e279f11 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 28 Jul 2022 22:44:42 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
index 0831463..4578ecc 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
@@ -89,28 +89,33 @@
return;
}
-// DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
-// if (fromMember == null) {
-// DappMemberEntity sourceAddress = dappMemberDao.selectByAddress(ChainEnum.BSC_TFC.getAddress(), null);
-// fromMember = dappMemberService.insertMember(e.from, sourceAddress.getInviteId());
-// return;
-// }
+ // 更新余额
+ DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null);
+ if (fromMember != null) {
+ BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(e.from);
+ fromMember.setBalance(balance);
+ dappMemberService.updateById(fromMember);
+ } else {
+ fromMember = dappMemberService.insertMember(e.from, null);
+ }
BigInteger tokens = e.tokens;
- BigDecimal amount = BigDecimal.valueOf(tokens.intValue()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
+ BigDecimal amount = new BigDecimal(tokens.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
- // 如果转账对象地址不为源池地址，且对象地址在系统中存在并未激活，则激活用户
+ // 如果转账对象地址不为源池地址，注册该用户并绑定上下级关系
if (!e.to.equals(ChainEnum.BSC_TFC_SOURCE.getAddress().toLowerCase())) {
DappMemberEntity toMember = dappMemberDao.selectByAddress(e.to, null);
if (toMember == null) {
-// toMember = dappMemberService.insertMember(e.to, fromMember.getInviteId());
- return;
+ toMember = dappMemberService.insertMember(e.to, fromMember.getInviteId());
}
- if (toMember.getActiveStatus() == 2) {
- toMember.setActiveStatus(1);
- dappMemberService.updateById(toMember);
- }
+// if (toMember.getActiveStatus() == 2) {
+// toMember.setActiveStatus(1);
+// }
+ // 更新余额
+ BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(e.to);
+ toMember.setBalance(balance);
+ dappMemberService.updateById(toMember);
OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_ONLINE, AppContants.SYMBOL_COIN);
}
@@ -133,7 +138,7 @@
boolean hasFlow = false;
for (DappFundFlowEntity flow : flows) {
if (flow.getStatus() == 1) {
- if (amount.compareTo(flow.getTargetAmount()) == 0) {
+ if (amount.compareTo(flow.getAmount()) == 0) {
hasFlow = true;
fundFlow = flow;
fundFlow.setFromHash(e.log.getTransactionHash());
@@ -149,6 +154,10 @@
}
OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_APPLICATION, AppContants.SYMBOL_COIN);
+ if (fundFlow.getAmount().add(fundFlow.getFee()).compareTo(amount) != 0) {
+ return;
+ }
+
BigDecimal newPrice = fundFlow.getNewestPrice();
BigDecimal transferAmount = amount.multiply(newPrice);
--
Gitblit v1.9.1