From 407729ff6fc2181a417121e02f61aee7ce78fdda Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 16:34:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/resources/mapper/dapp/DappFundFlowDao.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/dapp/DappFundFlowDao.xml b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
index 92574b1..a44ab9c 100644
--- a/src/main/resources/mapper/dapp/DappFundFlowDao.xml
+++ b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
@@ -109,6 +109,7 @@
where status = #{status}
and version = #{version}
and from_hash is null
+ and is_return = 2
ORDER BY
id ASC
LIMIT 1
@@ -120,10 +121,12 @@
and type = #{type}
</select>
- <select id="selectListBySystemProfitIdAndState" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+ <select id="selectListByState" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
select *
from dapp_fund_flow
- where system_profit_id = #{systemProfitId}
- and status = #{status}
+ where status = #{status}
+ and version = 1
+ and type != 1
+ and type != 6
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1