From 971f739f9ee5fb868d72f9a85d65e9f0791d5032 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Mar 2023 12:35:36 +0800
Subject: [PATCH] 后台修改
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 29afe0a..287c83c 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,8 +3,16 @@
<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,IFNULL(c.commission,0) commission
- ,d.description levelName
+ 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,
+ IFNULL(c.star,0) star,
+ IFNULL(c.total_score,0) totalScore,
+ 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
@@ -85,11 +93,11 @@
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
- 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,
+ where e.status in (2, 3, 4) and e.order_type=1 and (b.invite_id=a.invite_id or find_in_set(a.invite_id, b.referrer_ids))) 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 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
+ where e.invite_id=a.invite_id or find_in_set(a.invite_id, e.referrer_ids)) orderCnt,
+ (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'
@@ -143,8 +151,7 @@
sum(b.amount)
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 = m.invite_id
OR e.referrer_id = m.invite_id
@@ -217,8 +224,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}
@@ -266,7 +272,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>
--
Gitblit v1.9.1