From aa861e83f2a7a5f99ed30d448c129c2032b71af6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 May 2023 09:39:58 +0800
Subject: [PATCH] 微信支付
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index a70bd00..6ef3969 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,12 +3,18 @@
<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,
+ d.code 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
- LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL'
+ LEFT JOIN data_dictionary_custom d on d.code = m.level
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
@@ -77,23 +83,21 @@
a.name,
a.phone,
a.invite_id,
+ a.level,
2 isCurrent,
a.created_time,
p.prize_score,
- u.description levelName,
(select sum(e.amount)
- from mall_order_info e
+ from mall_achieve_record 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 (b.invite_id=a.invite_id or b.referrer_id=a.invite_id)) 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 e.invite_id=a.invite_id or e.referrer_id=a.invite_id) orderCnt,
- (select count(1) from mall_member x where x.referrer_id=a.invite_id) cnt
+ where find_in_set(a.invite_id, e.referrer_ids) or e.invite_id = a.invite_id) orderCnt,
+ (select count(1) from mall_member x where 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}
+ inner join mall_member_wallet p on a.id = p.member_id
+ where a.referrer_id = #{inviteId}
</select>
<select id="selectOwnOrderAmountByInviteId" resultType="java.math.BigDecimal">
@@ -143,11 +147,9 @@
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
or find_in_set(m.invite_id, e.referrer_ids)
),0) amount
FROM mall_member m
@@ -217,11 +219,9 @@
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}
or find_in_set(#{inviteId}, e.referrer_ids)
</select>
@@ -347,7 +347,7 @@
inner join mall_member b on a.member_id=b.ID
where 1=1
<!-- 月 -->
- <if test="record.query == '2'">
+ <if test="record.query == 2">
and date_format(#{record.createdTime},'%Y-%m') = date_format(a.achieve_time,'%Y-%m')
</if>
group by b.referrer_id
@@ -388,10 +388,13 @@
<where>
1=1
<if test="type == 1">
- and director = 1
+ and level= 'V_DIRECTOR'
</if>
<if test="type == 2">
and store_master = 1
+ </if>
+ <if test="type == 3">
+ and partner = 1
</if>
</where>
</select>
@@ -400,4 +403,11 @@
select * from mall_member
where level=#{level}
</select>
+
+ <select id="selectAllAchieveByInviteId" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(a.amount, 0)), 0)
+ from mall_achieve_record a
+ inner join mall_member b on a.member_id=b.ID
+ where find_in_set(#{inviteId}, b.referrer_ids) or b.invite_id = #{inviteId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1