From f21b1c12248daaac71491aaf2e46908fadc63377 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 11 Jun 2023 11:34:21 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 88 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 3f488f7..b7ab81e 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -12,6 +12,8 @@
IFNULL(c.commission,0) commission,
IFNULL(c.star,0) star,
IFNULL(c.total_score,0) totalScore,
+ IFNULL(c.voucher_cnt,0) voucherCnt,
+ IFNULL(c.voucher_amount,0) voucherAmount,
d.description levelName
FROM mall_member m
left join mall_member a on m.referrer_id = a.invite_id
@@ -41,7 +43,7 @@
</if>
</if>
</where>
- order by m.CREATED_TIME desc
+ order by m.id desc
</select>
<select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
@@ -85,10 +87,11 @@
a.name,
a.phone,
a.invite_id,
+ a.sex,
+ a.level,
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
@@ -100,7 +103,6 @@
(select count(1) from mall_member x where x.invite_id=a.invite_id or 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>
@@ -224,8 +226,7 @@
ifnull(sum(b.amount),0)
FROM
mall_member e
- INNER JOIN mall_order_info b ON e.id = b.member_id
- AND b. STATUS = 4
+ INNER JOIN mall_achieve_record b ON e.id = b.member_id
WHERE
e.invite_id = #{inviteId}
OR e.referrer_id = #{inviteId}
@@ -273,7 +274,7 @@
SELECT a.id,d.code levelCode
FROM mall_member a
LEFT JOIN data_dictionary_custom d on d.code = a.level
- where a.id = #{id} and d.type = 'AGENT_LEVEL'
+ where a.id = #{id} and d.type = 'AGENT_LEVEL_REQUIRE'
GROUP BY a.id
</select>
@@ -432,4 +433,79 @@
from mall_member
where store_master = #{state}
</select>
+
+ <select id="selectByRole" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ <where>
+ <if test="type == 3">
+ and creater = #{state}
+ </if>
+ <if test="type == 4">
+ and partner = #{state}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectParentMemberList" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ where invite_id!=#{refererId} and invite_id IN
+ <foreach collection = "list" item = "item" separator="," open = "(" close = ")" >
+ #{item}
+ </foreach >
+ order by id desc
+ <if test="limit != null">
+ limit #{limit}
+ </if>
+ </select>
+
+ <select id="selectMemberAfterLevelList" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ SELECT
+ m.*, b.
+ VALUE
+
+ FROM
+ mall_member m
+ INNER JOIN data_dictionary_custom b ON m.LEVEL = b. CODE
+ WHERE 1=1
+ AND b.type = 'AGENT_LEVEL'
+ AND b.VALUE > (
+ SELECT
+ VALUE
+ FROM
+ data_dictionary_custom a
+ WHERE
+ a. CODE = #{level}
+ AND a.type = 'AGENT_LEVEL'
+ )
+ GROUP BY
+ m.id
+ </select>
+
+ <select id="selectAgentOrPartnetMemberList" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member a
+ where 1=1
+ <if test="level == 2">
+ and a.account_level in (2, 3)
+ </if>
+ <if test="level == 3">
+ and a.account_level = 3
+ </if>
+ </select>
+
+ <select id="selectOwnCntByInviteIdAndAccountLevel" resultType="java.lang.Integer">
+ select IFNULL(count(1),0)
+ from mall_member x where x.referrer_id=#{inviteId}
+ and x.level != 'ZERO_LEVEL'
+ <if test="accountLevel == 1">
+ and x.account_level = #{accountLevel}
+ </if>
+ <if test="accountLevel == 3 or accountLevel == 2">
+ and x.account_level in (2, 3)
+ </if>
+ </select>
+
+ <select id="selectMatrixTreeMemberList" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select memberInfo.* from mall_member memberInfo
+ inner join matrix_tree_node nodeInfo on memberInfo.id=nodeInfo.tree_node
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1