From e9892b2cfb4b33ecb80c033e4074f65a341fc1b3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 24 Nov 2023 11:56:13 +0800
Subject: [PATCH] 匹配
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 30011e0..0593be1 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -5,7 +5,7 @@
<select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
SELECT
m.*,
- a.name referrerName,
+ a.account_login referrerName,
IFNULL(c.balance,0) balance,
IFNULL(c.score,0) score,
IFNULL(c.prize_score,0) prizeScore,
@@ -14,7 +14,14 @@
IFNULL(c.total_score,0) totalScore,
IFNULL(c.voucher_cnt,0) voucherCnt,
IFNULL(c.voucher_amount,0) voucherAmount,
- d.description levelName
+ IFNULL(c.voucher_fire_cnt,0) voucherFireCnt,
+ (SELECT
+ sum(IFNULL(surplus_cnt, 0))
+ FROM
+ mall_score_record
+ WHERE
+ member_id = m.id) voucherCntSurplus,
+ d.description levelName
FROM mall_member m
left join mall_member a on m.referrer_id = a.invite_id
LEFT JOIN mall_member_wallet c on c.member_id = m.id
@@ -76,6 +83,10 @@
select * from mall_member where phone=#{account} or email=#{account} or invite_id=#{account}
</select>
+ <select id="selectInfoByAccountNew" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member where phone = #{phone} and account_login = #{account}
+ </select>
+
<select id="selectInfoByInviteId" resultType="cc.mrbird.febs.mall.entity.MallMember">
select * from mall_member where invite_id=#{inviteId}
</select>
@@ -87,7 +98,7 @@
<select id="selectTeamListByInviteId" resultType="cc.mrbird.febs.mall.vo.TeamListVo">
select
a.id,
- a.name,
+ a.account_login name,
a.phone,
a.invite_id,
2 isCurrent,
@@ -280,7 +291,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_REQUIRE'
+ where a.id = #{id} and d.type = 'AGENT_LEVEL'
GROUP BY a.id
</select>
@@ -466,4 +477,14 @@
select * from mall_member
where account_login = #{accountLogin} and password = #{password}
</select>
+
+ <select id="selectByUserKey" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ where user_key = #{userKey}
+ </select>
+
+ <select id="selectAccountLoginAndUserKey" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ where account_login = #{accountLogin} and user_key = #{userKey}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1