From a64d6284082665f9a27add91edc0f7dc7e31afb7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 08 Nov 2022 11:23:00 +0800
Subject: [PATCH] 20221021

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

diff --git a/src/main/resources/mapper/dapp/DappFundFlowDao.xml b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
index a8f1abd..a07f24d 100644
--- a/src/main/resources/mapper/dapp/DappFundFlowDao.xml
+++ b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
@@ -22,7 +22,7 @@
                 and a.member_id=#{record.memberId}
             </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">
@@ -48,16 +48,31 @@
         <if test="status != null">
             and a.status=#{status}
         </if>
+        order by a.id desc
     </select>
 
     <select id="selectAmountTotalByType" resultType="java.util.HashMap">
         select
-            case when type=1 then amount end buy,
-            case when type=2 then amount end sale,
-            case when type=3 then amount end mine,
-            case when type=4 then amount end teamReward
-        from (select type, sum(amount) amount from dapp_fund_flow
+            IFNULL(MAX(if(type = 1, a.amount, 0)),0) buy
+             , IFNULL(MAX(if(type = 2, a.amount, 0)),0) sale
+             , IFNULL(MAX(if(type = 3, a.amount, 0)),0) mine
+             , IFNULL(MAX(if(type = 4, a.amount, 0)),0) teamReward
+        from (select type, sum(amount) amount
+                 from dapp_fund_flow
                  where member_id=#{memberId}
-             ) a
+                 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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1