From 11e14ba210ed19aaf89cade6d5b51b6c53ca38aa Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Tue, 13 Dec 2022 16:54:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB

---
 src/main/resources/mapper/dapp/DappFundFlowDao.xml |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/dapp/DappFundFlowDao.xml b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
index 39fe65b..17b12ed 100644
--- a/src/main/resources/mapper/dapp/DappFundFlowDao.xml
+++ b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
@@ -21,8 +21,14 @@
             <if test="record.memberId != null">
                 and a.member_id=#{record.memberId}
             </if>
+            <if test="record.fromHash != '' and record.fromHash != null">
+                and a.from_hash = #{record.fromHash}
+            </if>
+            <if test="record.systemProfitId != '' and record.systemProfitId != null">
+                and a.system_profit_id = #{record.systemProfitId}
+            </if>
         </where>
-        order by a.create_time desc
+        order by a.create_time desc, a.id desc
     </select>
 
     <select id="selectListForMemberAndDay" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
@@ -63,4 +69,63 @@
                  group by type
             ) a
     </select>
+
+    <select id="selectProfitAmountByMemberId" resultType="java.math.BigDecimal">
+        select ifnull(sum(amount), 0) from dapp_fund_flow
+        where member_id=#{memberId} and type in (2,3)
+    </select>
+
+    <select id="selectNewestFundFlow" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+        select * from dapp_fund_flow
+        where member_id=#{memberId} and type = #{type}
+        order by id desc
+        limit 1
+    </select>
+
+    <select id="selectSumAmountByMemberIdAndTypeAndStatus" resultType="java.math.BigDecimal">
+        select ifnull(sum(amount), 0) from dapp_fund_flow
+        where member_id = #{memberId}
+          and type = #{type}
+        and status = #{status}
+    </select>
+
+    <select id="selectInfoById" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+        select a.* from dapp_fund_flow a
+        where a.id = #{id}
+          for update
+    </select>
+
+    <update id="updateStatusById">
+        update dapp_fund_flow
+        set status = #{status},
+            version = version + 1
+    where id = #{id}
+        and version = 1
+        and status = 1
+    </update>
+
+    <select id="selectByStateAndVersionAndFromHashLimitOne" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+        select * from dapp_fund_flow
+        where status = #{status}
+          and version = #{version}
+          and from_hash is null
+        ORDER BY
+            id ASC
+            LIMIT 1
+    </select>
+
+    <select id="selectBymemberIdAndType" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+        select * from dapp_fund_flow
+        where member_id = #{memberId}
+          and type = #{type}
+    </select>
+
+    <select id="selectListByState" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+        select *
+        from dapp_fund_flow
+        where status = #{status}
+          and version = 1
+        and type != 1
+        and type != 6
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1