From f16f74cacb9ef0ae4be89ed15353b6a449479d8c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 28 May 2025 13:38:09 +0800
Subject: [PATCH] feat(mall): 添加轮播图背景图片功能

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |   96 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 307315a..067fd07 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -45,12 +45,19 @@
     <select id="selectHappyMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
         SELECT
                a.*,
+               d.balance balance,
+               d.score score,
+               d.prize_score prizeScore,
+               d.commission commission,
+               d.total_score totalScore,
                b.name storeMasterName,
                c.name directorName
         FROM mall_member a
         left join happy_sale_level b on b.code = a.store_master
         left join happy_member_level c on c.code = a.director
+        left join mall_member_wallet d on d.member_id = a.id
         <where>
+            and a.phone is not null
             <if test="record != null" >
                 <if test="record.birthdayQuery!=null">
                     and date_format(a.birthday, '%m-%d') = date_format(#{record.birthdayQuery}, '%m-%d')
@@ -97,6 +104,7 @@
                IFNULL(c.balance,0) balance,
                IFNULL(c.score,0) score,
                IFNULL(c.prize_score,0) prizeScore,
+               IFNULL(c.commission,0) commission,
                d.description levelName,
                b.name
                FROM mall_member a
@@ -183,7 +191,7 @@
 
     <select id="getAgentListInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentVo">
 
-        SELECT m.*,a.description levelName,
+        SELECT m.*,a.name levelName,
         ifnull((
         SELECT
         sum(b.amount)
@@ -197,8 +205,9 @@
         or find_in_set(m.invite_id, e.referrer_ids)
         ),0) amount
         FROM mall_member m
-        left join data_dictionary_custom a on a.code = m.level
+        left join happy_sale_level a on a.code = m.store_master
         <where>
+             and m.store_master != 0
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and m.name like concat('%',  #{record.name},'%')
@@ -245,8 +254,8 @@
     </select>
 
     <select id="getAgentChildInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentMemberVo">
-        select m.*,a.description levelName from mall_member m
-            left join data_dictionary_custom a on a.code = m.level
+        select m.*,a.name levelName from mall_member m
+            left join happy_sale_level a on a.code = m.store_master
         where  find_in_set(#{record.inviteId}, m.referrer_ids)
         GROUP BY m.id
         ORDER BY
@@ -492,4 +501,83 @@
         where id = #{id}
     </update>
 
+
+
+    <select id="selectTeamPage" resultType="cc.mrbird.febs.mall.vo.sale.ApiTeamListInfoVo">
+
+        SELECT
+            a. NAME memberName,
+            a.is_sale isSale,
+            a.CREATED_TIME createdTime,
+            ifnull(
+                (
+                SELECT
+                count(c.id)
+                FROM
+                mall_order_info c
+                WHERE
+                a.id = c.member_id
+                    and c.status = 4
+                ),
+                0
+            ) orderCnt,
+            ifnull(
+                (
+                SELECT
+                sum(b.amount)
+                FROM
+                mall_order_info b
+                WHERE
+                a.id = b.member_id
+                    and b.status = 4
+                ),
+                0
+            ) totalAmount
+        FROM
+            mall_member a
+        <where>
+            and find_in_set(#{record.inviteId}, a.referrer_ids)
+            <if test="record != null" >
+                <if test="record.memberName != null and record.memberName != ''">
+                    and a.name like concat('%',  #{record.memberName},'%')
+                </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>
+        order by a.CREATED_TIME desc
+    </select>
+
+
+
+    <select id="selectSalePage" resultType="cc.mrbird.febs.mall.vo.sale.ApiSaleListInfoVo">
+        SELECT
+            c.name memberName,
+            a.CREATED_TIME createdTime,
+            a.cost_amount costAmount,
+            a.amount amount
+        FROM mall_achieve_record a
+        left join mall_order_info b on a.order_id = b.id
+        left join mall_member c on b.member_id = c.id
+        <where>
+            and a.member_id = #{record.memberId}
+            <if test="record != null" >
+                <if test="record.memberName != null and record.memberName != ''">
+                    and c.name like concat('%',  #{record.memberName},'%')
+                </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>
+        order by a.CREATED_TIME desc
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1