From cbfcb952897532e377dd3027f6834c82d38341fc Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 12 Jun 2023 22:01:36 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index e5bdb94..b7ab81e 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -482,13 +482,13 @@
</select>
<select id="selectAgentOrPartnetMemberList" resultType="cc.mrbird.febs.mall.entity.MallMember">
- select * from mall_membebr a
+ select * from mall_member a
where 1=1
<if test="level == 2">
- a.account_level in (2, 3)
+ and a.account_level in (2, 3)
</if>
<if test="level == 3">
- a.account_level = 3
+ and a.account_level = 3
</if>
</select>
@@ -496,11 +496,16 @@
select IFNULL(count(1),0)
from mall_member x where x.referrer_id=#{inviteId}
and x.level != 'ZERO_LEVEL'
- <if test="accountLevel == 1 or accountLevel == 2">
+ <if test="accountLevel == 1">
and x.account_level = #{accountLevel}
</if>
- <if test="accountLevel == 3">
+ <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