From 85e204ffc471a73fd9cab58470f906e1ef3c13c4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 29 Feb 2024 10:14:59 +0800
Subject: [PATCH] 抽奖

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index c1781b7..7ebba37 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -4,41 +4,17 @@
 
     <select id="selectMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo">
         select
-               a.*,
-               b.name fromMemberName
+               a.*
         from mall_money_flow a
-        left join mall_member b on a.rt_member_id = b.id
         where a.member_id = #{record.id}
         order by a.CREATED_TIME desc
     </select>
 
     <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>
+        where a.member_id=#{record.memberId}
         order by a.created_time desc
     </select>
 
@@ -47,6 +23,7 @@
         a.*,
         b.name,
         b.bind_phone bindPhone,
+        b.account_login accountLogin,
         c.pay_method payMethod,
         b.phone,
         d.name fromMemberName
@@ -56,6 +33,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>
@@ -63,7 +43,7 @@
                     and b.phone like concat('%',  #{record.phone},'%')
                 </if>
                 <if test="record.type!=null and record.type!=''">
-                    and a.type like concat('%',  #{record.type},'%')
+                    and a.type = #{record.type}
                 </if>
                 <if test="record.flowType!=null and record.flowType!=''">
                     and a.flow_type like concat('%',  #{record.flowType},'%')
@@ -83,12 +63,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>
@@ -123,7 +107,7 @@
 
     <select id="selectCommissionIncome" resultType="java.math.BigDecimal">
         select ifnull(sum(amount),0) from mall_money_flow
-        where flow_type =4 and type in (1,2,3,4,5,6,7,15,16,17) and member_id=#{memberId}
+        where type in (2,19,20,21,22,23,24,27,28,29,30) and member_id=#{memberId}
         <if test="type == 1">
             and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
         </if>
@@ -195,4 +179,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