From d1c4c4b56f065d28cadf90370e0709294cfcdbc4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 10 Oct 2022 16:16:32 +0800
Subject: [PATCH] 20220707
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 4d17957..e2f54d7 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
@@ -100,7 +100,7 @@
}
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())) {
@@ -138,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());
@@ -154,8 +154,12 @@
}
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);
+ BigDecimal transferAmount = fundFlow.getAmount().multiply(newPrice);
// 更改状态为已同步
fundFlow.setStatus(2);
--
Gitblit v1.9.1