From c5d750c054ba7c06757f024d51a379f5bef0b6d0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 07 Dec 2023 14:41:13 +0800
Subject: [PATCH] 用户留言

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 6f89a70..ab30866 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -42,20 +42,41 @@
         order by a.created_time desc
     </select>
 
+    <select id="selectApiFcmMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
+        select
+        a.*
+        from mall_money_flow a
+        <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
+    </select>
+
     <select id="getMoneyFlowListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMoneyFlowListVo">
         select
         a.*,
-        b.name,
-        b.bind_phone bindPhone,
-        c.pay_method payMethod,
-        b.phone,
-        d.name fromMemberName
+        b.account_login accountLogin
         from mall_money_flow a
         left join mall_member b on a.member_id=b.id
-        left join mall_order_info c on a.order_no = c.order_no
-        left join mall_member d on d.id = a.rt_member_id
         <where>
             <if test="record != null" >
+                <if test="record.accountLogin!=null and record.accountLogin!=''">
+                    and b.account_login like concat('%',  #{record.accountLogin},'%')
+                </if>
                 <if test="record.name!=null and record.name!=''">
                     and b.name like concat('%',  #{record.name},'%')
                 </if>
@@ -83,12 +104,16 @@
         a.remark remark,
         a.status status,
         b.name,
+        b.account_login accountLogin,
         b.bind_phone bindPhone,
         b.phone
         from mall_member_withdraw a
         inner join mall_member b on a.member_id=b.id
         <where>
             <if test="record != null" >
+                <if test="record.accountLogin!=null and record.accountLogin!=''">
+                    and b.account_login like concat('%',  #{record.accountLogin},'%')
+                </if>
                 <if test="record.name!=null and record.name!=''">
                     and b.name like concat('%',  #{record.name},'%')
                 </if>
@@ -241,4 +266,16 @@
         ORDER BY
             a.created_time ASC
     </select>
+
+    <select id="selectByOrderAndType" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+        SELECT
+            *
+        FROM
+            mall_money_flow a
+        WHERE
+            a.type = #{type}
+          AND a.flow_type = #{flowType}
+          AND a.member_id = #{memberId}
+          AND a.order_no = #{orderNo}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1