From cf850c5d93b6b1dcfcd6da06faeb3ea7e093ad91 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Aug 2023 17:55:47 +0800
Subject: [PATCH] jufu商城

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index a453577..fa8acd8 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -47,6 +47,7 @@
         a.*,
         b.name,
         b.bind_phone bindPhone,
+        b.account_login accountLogin,
         c.pay_method payMethod,
         b.phone,
         d.name fromMemberName
@@ -56,6 +57,9 @@
         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 +87,20 @@
         a.remark remark,
         a.status status,
         b.name,
+        b.account_login accountLogin,
         b.bind_phone bindPhone,
-        b.phone
+        b.phone,
+        c.name aliName,
+        c.ali_num aliNum,
+        c.ali_pic aliPic
         from mall_member_withdraw a
         inner join mall_member b on a.member_id=b.id
+        left join mall_member_alipay c on c.id = a.wtihdraw_type_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>
@@ -195,4 +207,50 @@
         where a.order_no = #{record.orderNo}
         order by a.CREATED_TIME desc
     </select>
+
+    <select id="selectMoneyFlowByMemberIdAndIsRetrun" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+        SELECT
+            *
+        FROM
+            mall_money_flow a
+        WHERE
+            a.type = 26
+          AND a.flow_type = 6
+          AND a.is_return = #{isReturn}
+          AND a.member_id = #{memberId}
+        ORDER BY
+            a.created_time ASC
+    </select>
+
+    <update id="updateRemarkById">
+        update mall_money_flow
+        <set>
+            remark = #{remark}
+        </set>
+        WHERE id =  #{id}
+    </update>
+
+    <update id="updateRemarkAndIsReturnById">
+        update mall_money_flow
+        <set>
+            remark = #{remark},
+            is_return = 1
+        </set>
+        WHERE id =  #{id}
+    </update>
+
+    <select id="selectByOrderNoAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+        SELECT
+            *
+        FROM
+            mall_money_flow a
+        WHERE
+            a.type = 25
+          AND a.flow_type = 5
+          AND a.is_return = #{isReturn}
+          AND a.member_id = #{memberId}
+          AND a.order_no = #{orderNo}
+        ORDER BY
+            a.created_time ASC
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1