From 7c6f033b8754b07bf5c75ae8745a982d76f9abb4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Sep 2022 19:28:14 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 86 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 30 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 30a114d..dd74bb6 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.mall.mapper.MallMemberMapper">
<select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
- SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance,IFNULL(c.score,0) score,IFNULL(c.prize_score,0) prizeScore
+ SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance,IFNULL(c.score,0) score,IFNULL(c.prize_score,0) prizeScore,IFNULL(c.commission,0) commission
,d.description levelName
FROM mall_member m
left join mall_member a on m.referrer_id = a.invite_id
@@ -28,9 +28,12 @@
<if test="record.accountType != null" >
and m.account_type = #{record.accountType}
</if>
+ <if test="record.level!=null and record.level!=''">
+ and m.level=#{record.level}
+ </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">
@@ -81,12 +84,12 @@
(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
+ 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 e.invite_id=a.invite_id or e.referrer_id=a.invite_id) orderCnt,
- (select count(1) from mall_member x where x.referrer_id=a.invite_id) cnt
+ 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
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'
@@ -318,35 +321,34 @@
</select>
<!-- <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">-->
-<!-- select * from (-->
-<!-- select a.id, a.name, a.invite_id, a.avatar, sum(b.amount) amount,max(order_time) orderTime from mall_member a, mall_order_info b-->
-<!-- where a.id=b.member_id and b.status = 4-->
-<!-- <!– 日 –>-->
-<!-- <if test="record.query == '1'">-->
-
-<!-- </if>-->
-<!-- <!– 月 –>-->
-<!-- <if test="record.query == '2'">-->
-<!-- and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')-->
-<!-- </if>-->
-<!-- <if test="record.amount != null">-->
-<!-- and amount = #{record.amount}-->
-<!-- </if>-->
-<!-- group by a.id-->
-<!-- ) a order by amount desc, a.orderTime desc-->
+<!-- select a.*, b.*-->
+<!-- from mall_member a-->
+<!-- inner join (-->
+<!-- select b.referrer_id refererId, sum(a.amount) amount, max(a.order_time) orderTime-->
+<!-- from mall_order_info a-->
+<!-- inner join mall_member b on a.member_id=b.ID-->
+<!-- inner join mall_order_item c on a.id = c.order_id and c.is_normal=2-->
+<!-- where a.status in (2, 3, 4) and a.order_type=1-->
+<!-- <!– 月 –>-->
+<!-- <if test="record.query == '2'">-->
+<!-- and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')-->
+<!-- </if>-->
+<!-- group by b.referrer_id-->
+<!-- ) b on a.invite_id=b.refererId-->
+<!-- order by b.amount desc, b.orderTime desc-->
<!-- </select>-->
+
<select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
select a.*, b.*
from mall_member a
inner join (
- select b.referrer_id refererId, sum(a.amount) amount, max(a.order_time) orderTime
- from mall_order_info a
+ select b.referrer_id refererId, sum(a.amount) amount, max(a.pay_time) orderTime
+ from mall_achieve_record a
inner join mall_member b on a.member_id=b.ID
- inner join mall_order_item c on a.id = c.order_id and c.is_normal=2
- where a.status in (2, 3, 4) and a.order_type=1
+ where 1=1
<!-- 月 -->
<if test="record.query == '2'">
- and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')
+ and date_format(#{record.createdTime},'%Y-%m') = date_format(a.achieve_time,'%Y-%m')
</if>
group by b.referrer_id
) b on a.invite_id=b.refererId
@@ -355,15 +357,14 @@
<select id="selectAchieveByMemberId" resultType="java.math.BigDecimal">
select IFNULL(sum(IFNULL(a.amount, 0)), 0)
- from mall_order_info a
+ from mall_achieve_record a
inner join mall_member b on a.member_id=b.ID
- inner join mall_order_item c on a.id = c.order_id and c.is_normal=2
- where a.status in (2, 3, 4) and a.order_type=1
+ where 1=1
<if test="type == 1">
and b.invite_id=#{inviteId}
</if>
<if test="type == 2">
- and b.referrer_id=#{inviteId}
+ and find_in_set(#{inviteId}, b.referrer_ids)
</if>
</select>
@@ -381,4 +382,29 @@
select * from mall_member
where referrer_id=#{inviteId} and level != 'ZERO_LEVEL'
</select>
+
+ <select id="selectDirectorsOrStoreMaster" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ <where>
+ 1=1
+ <if test="type == 1">
+ and director = 1
+ </if>
+ <if test="type == 2">
+ and store_master = 1
+ </if>
+ </where>
+ </select>
+
+ <select id="selectMemberWithLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ where level=#{level}
+ </select>
+
+ <select id="selectMemberByOpenId" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ SELECT a.*
+ FROM mall_member a
+ where a.open_id = #{openId} limit 1
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1