From 1bf57dbbb7025facb8a3e3c2074e82af6f13b24f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Apr 2022 15:13:59 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index b6ef4b8..1586995 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -18,14 +18,20 @@
             left join mall_member b on a.rt_member_id=b.id
             left join data_dictionary_custom c on b.level = c.code and c.type='AGENT_LEVEL'
         <where>
-            <if test="record.type == 3">
+            <if test="record.inOrOut == 3">
                 and a.amount > 0
             </if>
-            <if test="record.type == 2">
+            <if test="record.inOrOut == 2">
                 and 0 > a.amount
             </if>
             <if test="record.memberId != null">
                 and a.member_id=#{record.memberId}
+            </if>
+            <if test="record.flowType != null and record.flowType != ''">
+                and a.flow_type=#{record.flowType}
+            </if>
+            <if test="record.type != null and record.type != ''">
+                and a.type=#{record.type}
             </if>
         </where>
         order by a.created_time desc
@@ -96,6 +102,6 @@
     </update>
 
     <select id="selectProfitByDateAndMemberId" resultType="java.math.BigDecimal">
-        select sum(a.amount) from mall_money_flow a where member_id=#{memberId} and type in (1,2) and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d');
+        select ifnull(sum(a.amount),0) from mall_money_flow a where member_id=#{memberId} and type in (1,2) and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d');
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1