From e35c3d097d91d5aea14f862bd14ef455c096d080 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 28 Aug 2022 02:22:19 +0800
Subject: [PATCH] fix

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

diff --git a/src/main/resources/mapper/dapp/DappFundFlowDao.xml b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
index a8f1abd..73b9373 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,24 @@
         <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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1