From 84c7afc62bb1eb6f5d80d2d9928d0d11a1ffbdda Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Aug 2023 21:14:13 +0800
Subject: [PATCH] 赠送积分更新状态

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 6840259..896337e 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -9,16 +9,10 @@
 
     <select id="selectApiMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
         select
-            a.*,
-            case when a.rt_member_id is null then (select n.phone from mall_member n where n.id=a.member_id)
-                 when a.rt_member_id is not null then (select m.phone from mall_member m where m.id=a.rt_member_id)
-            end phone,
-            c.description memberLevel
+            a.*
         from mall_money_flow a
-            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>
-            1=1 and a.status = 2
+            a.status is not NULL
             <if test="record.inOrOut == 3">
                 and a.amount > 0
             </if>
@@ -123,7 +117,7 @@
 
     <select id="selectCommissionIncome" resultType="java.math.BigDecimal">
         select ifnull(sum(amount),0) from mall_money_flow
-        where flow_type =4 and type in (1,2,3,4,5,6,7,15,16,17) and member_id=#{memberId}
+        where flow_type =1 and type in (2) and rt_member_id=#{memberId}
         <if test="type == 1">
             and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
         </if>
@@ -143,6 +137,11 @@
     <select id="selectOneByOrderNoAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
         select a.* from mall_money_flow a
         where a.order_no = #{rechargeNo} and a.member_id = #{memberId}
+    </select>
+
+    <select id="selectOneByOrderNoAndMemberIdAndRtMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+        select a.* from mall_money_flow a
+        where a.order_no = #{rechargeNo} and a.member_id = #{memberId} and a.rt_member_id = #{rtMemberId}
     </select>
 
     <select id="selectAmountByFlowtypeAndType" resultType="java.math.BigDecimal">
@@ -166,4 +165,11 @@
             </if>
         </where>
     </select>
+
+
+
+    <select id="selectMoneyFlowByOrderNo" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
+        select a.* from mall_money_flow a
+        where a.order_no = #{orderNo} and a.member_id = #{memberId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1