From aed9a0f76ba9c181b375c96f5091fc0ee07413c3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 14 Aug 2023 10:53:30 +0800
Subject: [PATCH] 赠送积分更新状态

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |   78 ++++++++++++++++++++++++++++++++++----
 1 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 94ea777..cb30a62 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -33,7 +33,7 @@
                 </if>
             </if>
         </where>
-        order by m.CREATED_TIME desc
+        GROUP BY m.id order by m.CREATED_TIME desc
     </select>
 
     <select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
@@ -80,19 +80,17 @@
             2 isCurrent,
             a.created_time,
             p.prize_score,
-            u.description levelName,
             (select sum(e.amount)
              from mall_order_info e
                       inner join mall_member b on e.member_id=b.ID
-                      inner join mall_order_item c on e.id = c.order_id -- and c.is_normal=2
-             where e.status in (2, 3, 4) and e.order_type=1 and (b.invite_id=a.invite_id or b.referrer_id=a.invite_id)) amount,
-            (select count(1) from mall_member e
-                      inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
-             where find_in_set(a.invite_id, e.referrer_ids)) orderCnt,
-            (select count(1) from mall_member x where find_in_set(a.invite_id, x.referrer_ids)) cnt
+                      inner join mall_order_item c on e.id = c.order_id
+             where e.status in (2, 3, 4) and (find_in_set(a.invite_id, b.referrer_ids))) amount,
+            (select count(e.id) from mall_order_info e
+                      inner join mall_member  b on e.id = b.member_id and e.status in (2, 3, 4)
+             where (find_in_set(a.invite_id, b.referrer_ids))) orderCnt,
+            (select count(1) from mall_member x where (find_in_set(a.invite_id, x.referrer_ids))) cnt
         from mall_member a
         inner join mall_member_wallet p on a.id=p.member_id
-        left join data_dictionary_custom u on a.level=u.code and u.type='AGENT_LEVEL'
         where a.referrer_id=#{inviteId}
     </select>
 
@@ -368,6 +366,19 @@
         </if>
     </select>
 
+    <select id="selectOrderAmountByMemberId" resultType="java.math.BigDecimal">
+        select IFNULL(sum(IFNULL(e.amount, 0)), 0)
+        from mall_order_info e
+        inner join mall_member b on e.member_id=b.ID
+        where e.status in (2, 3, 4)
+            <if test="type == 1">
+                and b.invite_id=#{inviteId}
+            </if>
+            <if test="type == 2">
+                and find_in_set(#{inviteId}, b.referrer_ids)
+            </if>
+    </select>
+
     <select id="selectMemberByName" resultType="cc.mrbird.febs.mall.entity.MallMember">
         select * from mall_member
         where name=#{name}
@@ -407,4 +418,53 @@
         where a.open_id = #{openId} limit 1
     </select>
 
+    <select id="findMallRollPerkInPage" resultType="cc.mrbird.febs.mall.entity.MallRollPerk">
+        select * from mall_roll_perk
+        where member_id = #{record.memberId}
+          and roll_id = #{record.rollId}
+        <if test="record.state != null and record.state != ''">
+            and state = #{record.state}
+        </if>
+        order by id desc
+    </select>
+
+    <select id="findMallMemberClassInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberClass">
+        select * from mall_member_class
+        where member_id = #{record.memberId}
+        order by id desc
+    </select>
+
+    <select id="findMallMemberHouseInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberHouse">
+        select * from mall_member_house
+        where member_id = #{record.memberId}
+        <if test="record.state != null and record.state != ''">
+            and state = #{record.state}
+        </if>
+        order by id desc
+    </select>
+
+    <select id="getMallRollHouseListInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberHouse">
+        select
+               a.*,
+               b.name,
+               b.phone
+        from mall_member_house a
+        left join mall_member b on a.member_id = b.id
+        <where>
+            <if test="record.state != null and record.state != ''">
+                and a.state = #{record.state}
+            </if>
+            <if test="record.orderNo != null and record.orderNo != ''">
+                and a.order_no = #{record.orderNo}
+            </if>
+            <if test="record.name != null and record.name != ''">
+                and b.name = #{record.name}
+            </if>
+            <if test="record.phone != null and record.phone != ''">
+                and b.phone = #{record.phone}
+            </if>
+
+        </where>
+        order by id desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1