From 5289e9842a8889f4128d95501ae80e1e93f4d6ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 17:35:41 +0800
Subject: [PATCH] fix

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index f5e1eb1..58c1e6b 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -12,17 +12,66 @@
             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">
+            <if test="record.type == 3">
                 and a.amount > 0
             </if>
-            <if test="record.type == 3">
+            <if test="record.type == 2">
                 and 0 > a.amount
             </if>
             <if test="record.memberId != null">
                 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 test="record.type!=null and record.type!=''">
+                    and a.type like concat('%',  #{record.type},'%')
+                </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