From 28450f858db096d02dab8e4d0c7041e3225a1be2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Jun 2022 17:08:24 +0800
Subject: [PATCH] fix

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 183418b..2efb9bc 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -110,7 +110,7 @@
 
     <select id="selectCommissionIncome" resultType="java.math.BigDecimal">
         select ifnull(sum(amount),0) from mall_money_flow
-        where flow_type=4 and amount > 0 and member_id=#{memberId}
+        where flow_type =4 and type in (1,2,3,4,5,6,7,15,16) and member_id=#{memberId}
         <if test="type == 1">
             and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
         </if>
@@ -118,4 +118,12 @@
             and date_format(created_time, '%Y-%m') = date_format(#{date}, '%Y-%m')
         </if>
     </select>
+
+    <select id="selectThankfulCommission" resultType="java.math.BigDecimal">
+        select ifnull(sum(amount),0) from mall_money_flow
+        where flow_type=4 and amount > 0
+          and member_id=#{memberId}
+          and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+          and type in (2,3,4)
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1