From 3a0ee38375a0fdf95ef734fa420030203ee31abd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 Jul 2023 17:08:30 +0800
Subject: [PATCH] 赠送积分更新状态

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index f94d009..7b73541 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -9,15 +9,11 @@
 
     <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'
+            left join mall_member b on a.member_id = b.id
         <where>
+            a.status != null
             <if test="record.inOrOut == 3">
                 and a.amount > 0
             </if>
@@ -48,6 +44,7 @@
         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 and a.status = 2
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and b.name like concat('%',  #{record.name},'%')
@@ -60,6 +57,12 @@
                 </if>
                 <if test="record.flowType!=null and record.flowType!=''">
                     and a.flow_type like concat('%',  #{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>
@@ -134,6 +137,35 @@
 
     <select id="selectOneByOrderNoAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
         select a.* from mall_money_flow a
-        where a.order_no = #{} and a.member_id = #{memberId}
+        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>
+
+
+
+    <select id="selectMoneyFlowByOrderNo" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
+        select a.* from mall_money_flow a
+        where a.order_no = #{orderNo} and a.member_id = #{memberId}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1