From 822de44fb84678ec4097e1ecb34adf944dffd1c2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Sep 2025 16:17:55 +0800
Subject: [PATCH] feat(mall): 根据当前用户公司 ID 筛选会员列表
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 34db249..500c516 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -45,15 +45,25 @@
<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')
+ </if>
+ <if test="record.companyId!=null and record.companyId!=''">
+ and a.company_Id = #{record.companyId}
</if>
<if test="record.name!=null and record.name!=''">
and a.name like concat('%', #{record.name},'%')
@@ -97,6 +107,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 +194,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 +208,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 +257,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
@@ -497,23 +509,35 @@
<select id="selectTeamPage" resultType="cc.mrbird.febs.mall.vo.sale.ApiTeamListInfoVo">
SELECT
- a.name memberName,
- a.CREATED_TIME createdTime,
+ a. NAME memberName,
+ a.is_sale isSale,
+ a.CREATED_TIME createdTime,
+ ifnull(
(
- SELECT
- count(c.id)
- FROM
- mall_achieve_record c
- where a.id = c.member_id
- ) orderCnt,
+ 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, 0)
- FROM
- mall_achieve_record b
- where a.id = b.member_id
- ) amount
- FROM mall_member a
+ 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" >
--
Gitblit v1.9.1