From 6c75b0c0fd6862b0d10793821db7017341a6a771 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 18 Aug 2023 16:48:31 +0800
Subject: [PATCH] 后台修改

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

diff --git a/src/main/resources/mapper/dapp/DappFundFlowDao.xml b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
index 17a8af7..297a83b 100644
--- a/src/main/resources/mapper/dapp/DappFundFlowDao.xml
+++ b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
@@ -35,7 +35,9 @@
         select
                a.amount amount,
                a.type type,
-               date_format(a.create_time, '%Y-%m-%d %h:%m:%s') createTime
+               a.from_hash fromAddress,
+               a.to_hash toAddress,
+               date_format(a.create_time, '%Y-%m-%d %H:%i:%s') createTime
         from dapp_fund_flow a
         <where>
             member_id = #{record.memberId}
@@ -45,8 +47,11 @@
             <if test="record.status != null">
                 and a.status = #{record.status}
             </if>
+            <if test="record.flowType != null">
+                and a.flow_type = #{record.flowType}
+            </if>
         </where>
-        order by a.create_time desc, a.id desc
+        order by a.create_time desc
     </select>
 
     <select id="selectListForMemberAndDay" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
@@ -110,7 +115,6 @@
     <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">
@@ -128,6 +132,18 @@
           and version = #{version}
           and from_hash is null
           and is_return = 2
+          and type in (2,3,27)
+        ORDER BY
+            id ASC
+            LIMIT 1
+    </select>
+
+    <select id="selectByStateAndVersionAndFromHashTwoLimitOne" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+        select * from dapp_fund_flow
+        where status = #{status}
+          and from_hash is null
+          and is_return = 2
+          and type in (5,6,34)
         ORDER BY
             id ASC
             LIMIT 1
@@ -148,4 +164,39 @@
         and type != 1
         and type != 6
     </select>
+
+    <select id="selectSumAmountByType" resultType="java.math.BigDecimal">
+        select ifnull(sum(amount), 0) from dapp_fund_flow
+        where  type = #{type}
+    </select>
+
+    <select id="selectOrderMoneyFlowInPage" resultType="cc.mrbird.febs.dapp.vo.AdminMallMoneyFlowVo">
+        select
+            a.create_time createTime,
+            a.amount amount,
+            a.type type,
+            b.address address
+        from dapp_fund_flow a
+                 left join dapp_member b on a.member_id = b.id
+        where a.system_profit_id = #{record.id}
+        order by a.CREATE_TIME desc
+    </select>
+
+    <select id="selectListByMemberIdAndTypeAndDate" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+        select * from dapp_fund_flow
+        where
+              member_id = #{memberId}
+          and date_format(create_time, '%Y-%m-%d') = date_format(#{dateStr}, '%Y-%m-%d')
+          and type = #{type}
+          and status = 2
+    </select>
+
+    <select id="selectListByTypeAndDate" resultType="cc.mrbird.febs.dapp.entity.DappFundFlowEntity">
+        select member_id as memberId,ifnull(sum(amount), 0) as amount
+        from dapp_fund_flow
+        where date_format(create_time, '%Y-%m-%d') = date_format(#{dateStr}, '%Y-%m-%d')
+          and type = #{type}
+          and status = 2
+        group by member_id
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1