From a8025084f0fc576917008e9e11e6e688a5723783 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 16:08:18 +0800
Subject: [PATCH] refactor(runVip): 修改会员添加和编辑页面的碳币状态字段

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 9089ced..fc5d0ec 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -9,29 +9,14 @@
 
     <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>
         order by a.created_time desc
@@ -41,13 +26,11 @@
         select
         a.*,
         b.name,
-        b.bind_phone bindPhone,
-        c.pay_method payMethod,
         b.phone
         from mall_money_flow a
         inner join mall_member b on a.member_id=b.id
-        left join mall_order_info c on a.order_no = c.order_no
         <where>
+            1=1
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and b.name like concat('%',  #{record.name},'%')
@@ -55,11 +38,17 @@
                 <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 test="record.type!=null">
+                    and a.type = #{record.type}
                 </if>
-                <if test="record.flowType!=null and record.flowType!=''">
-                    and a.flow_type like concat('%',  #{record.flowType},'%')
+                <if test="record.flowType!=null">
+                    and a.flow_type = #{record.flowType}
+                </if>
+                <if test="record.startTime != null and record.startTime != ''">
+                    and a.created_time &gt;= #{record.startTime}
+                </if>
+                <if test="record.endTime != null and record.endTime != ''">
+                    and a.created_time &lt;= #{record.endTime}
                 </if>
             </if>
         </where>
@@ -136,4 +125,26 @@
         select a.* from mall_money_flow a
         where a.order_no = #{rechargeNo} and a.member_id = #{memberId}
     </select>
+
+    <select id="selectAmountByFlowtypeAndType" resultType="java.math.BigDecimal">
+        select ifnull(sum(a.amount),0) from mall_money_flow a
+        <where>
+            a.member_id = #{memberId}
+            <if test="flowType!=null and flowType!=''">
+                and  a.flow_type = #{flowType}
+            </if>
+            <if test="type!=null and type!=''">
+                and  a.type = #{type}
+            </if>
+            <if test="status!=null and status!=''">
+                and  a.status = #{status}
+            </if>
+            <if test="dateDay!=null">
+                and date_format(a.created_time, '%Y-%m-%d') = date_format(#{dateDay}, '%Y-%m-%d')
+            </if>
+            <if test="dateMonth!=null">
+                and date_format(a.created_time, '%Y-%m') = date_format(#{dateMonth}, '%Y-%m')
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1