From 2ec9c53fac072e0546df78a359928a5b7c489eda Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 18 Dec 2024 10:04:03 +0800
Subject: [PATCH] refactor(mall): 重构会员管理功能

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index bb1a982..65ad4aa 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -9,29 +9,14 @@
 
     <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>
-            <if test="record.inOrOut == 3">
-                and a.amount > 0
-            </if>
-            <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
@@ -48,6 +33,7 @@
         inner join mall_member b on a.member_id=b.id
         left join mall_order_info c on a.order_no = c.order_no
         <where>
+            1=1 and a.status = 2
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and b.name like concat('%',  #{record.name},'%')
@@ -61,6 +47,12 @@
                 <if test="record.flowType!=null and record.flowType!=''">
                     and a.flow_type like concat('%',  #{record.flowType},'%')
                 </if>
+                <if test="record.startTime != null and record.startTime != ''">
+                    and a.created_time &gt;= #{record.startTime}
+                </if>
+                <if test="record.endTime != null and record.endTime != ''">
+                    and a.created_time &lt;= #{record.endTime}
+                </if>
             </if>
         </where>
         order by a.created_time desc

--
Gitblit v1.9.1