From f8d201010acbb9c530a38e64201d6b2a205fe394 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 25 Sep 2021 17:20:08 +0800
Subject: [PATCH] 20210925

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index f5e1eb1..69e9ebf 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -12,7 +12,7 @@
             a.*,
             b.phone
         from mall_money_flow a
-            inner join mall_member on a.rt_member_id=b.member_id
+            inner join mall_member b on a.member_id=b.id
         <where>
             <if test="record.type == 2">
                 and a.amount > 0
@@ -24,5 +24,51 @@
                 and a.member_id=#{record.memberId}
             </if>
         </where>
+        order by a.created_time desc
+    </select>
+
+    <select id="getMoneyFlowListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMoneyFlowListVo">
+        select
+        a.*,
+        b.name,
+        b.phone
+        from mall_money_flow a
+        inner join mall_member b on a.member_id=b.id
+        <where>
+            a.type != 6
+            <if test="record != null" >
+                <if test="record.name!=null and record.name!=''">
+                    and b.name like concat('%',  #{record.name},'%')
+                </if>
+                <if test="record.phone!=null and record.phone!=''">
+                    and b.phone like concat('%',  #{record.phone},'%')
+                </if>
+            </if>
+        </where>
+        order by a.created_time desc
+    </select>
+
+    <select id="getMoneyChargeListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMoneyChargeListVo">
+        select
+        a.*,
+        b.name,
+        b.phone
+        from mall_money_flow a
+        inner join mall_member b on a.member_id=b.id
+        <where>
+            a.type = 6
+            <if test="record != null" >
+                <if test="record.name!=null and record.name!=''">
+                    and b.name like concat('%',  #{record.name},'%')
+                </if>
+                <if test="record.phone!=null and record.phone!=''">
+                    and b.phone like concat('%',  #{record.phone},'%')
+                </if>
+                <if test="record.status!=null and record.status!=''">
+                    and a.status = #{record.status}
+                </if>
+            </if>
+        </where>
+        order by a.created_time desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1