From f58050b2e5ba95be6dca3e617dfacb7a717d6096 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 16 May 2025 17:37:41 +0800
Subject: [PATCH] feat(mall): 添加会员等级图标并更新销售信息

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 203a726..471ffd0 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -18,6 +18,7 @@
             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>
+            1=1 and a.status = 2
             <if test="record.inOrOut == 3">
                 and a.amount > 0
             </if>
@@ -48,6 +49,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 +62,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>
@@ -109,12 +117,13 @@
     </update>
 
     <select id="selectProfitByDateAndMemberId" resultType="java.math.BigDecimal">
-        select ifnull(sum(a.amount),0) from mall_money_flow a where member_id=#{memberId} and type in (1,2) and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d');
+        select ifnull(sum(a.amount),0) from mall_money_flow a
+        where member_id=#{memberId} and flow_type=4 and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d') and amount > 0
     </select>
 
     <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) and member_id=#{memberId}
+        where flow_type =4 and type in (1,2,3,4,5,6,7,15,16,17) and member_id=#{memberId}
         <if test="type == 1">
             and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
         </if>
@@ -130,4 +139,49 @@
           and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
           and type in (2,3,4)
     </select>
+
+    <select id="selectOneByOrderNoAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+        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>
+
+
+
+    <select id="selectFlowInPage" resultType="cc.mrbird.febs.mall.vo.ApiMoneyFlowVo">
+        select
+               a.amount amount,
+               a.status status,
+               a.CREATED_TIME createdTime,
+               a.remark remark
+        from mall_money_flow a
+        <where>
+            and a.member_id = #{record.memberId}
+            <if test="record.flowType!=null and record.flowType!=''">
+                and  a.flow_type = #{record.flowType}
+            </if>
+        </where>
+        order by a.CREATED_TIME desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1