From 04b325a1bd38f82d2c3e0f59b8f273f82287fe38 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Jun 2022 19:52:42 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java |    2 +-
 src/main/resources/mapper/dapp/DappFundFlowDao.xml                       |    1 +
 src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java |    2 +-
 3 files changed, 3 insertions(+), 2 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 273d30f..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
@@ -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());
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
index 2664c27..cc5afdb 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
@@ -107,7 +107,7 @@
                 boolean hasFlow = false;
                 for (DappFundFlowEntity flow : flows) {
                     if (flow.getStatus() == 1) {
-                        if (amount.compareTo(flow.getTargetAmount()) == 0) {
+                        if (amount.compareTo(flow.getAmount().multiply(flow.getNewestPrice())) == 0) {
                             hasFlow = true;
                             fundFlow = flow;
                             fundFlow.setFromHash(e.log.getTransactionHash());
diff --git a/src/main/resources/mapper/dapp/DappFundFlowDao.xml b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
index 7d3ba3c..fa8d4c8 100644
--- a/src/main/resources/mapper/dapp/DappFundFlowDao.xml
+++ b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
@@ -48,6 +48,7 @@
         <if test="status != null">
             and a.status=#{status}
         </if>
+        order by a.id desc
     </select>
 
     <select id="selectAmountTotalByType" resultType="java.util.HashMap">

--
Gitblit v1.9.1