From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 362 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 347 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index cc2fdca..0ae5631 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,7 +3,22 @@
<mapper namespace="cc.mrbird.febs.mall.mapper.MallMemberMapper">
<select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
- SELECT * FROM mall_member m
+ 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,
+ 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
+ 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_REQUIRE'
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
@@ -13,6 +28,7 @@
and (
m.phone like concat('%', #{record.account},'%')
or m.email like concat('%', #{record.account},'%')
+ or m.bind_phone like concat('%', #{record.account},'%')
or m.invite_id like concat('%', #{record.account},'%')
)
</if>
@@ -22,13 +38,17 @@
<if test="record.accountType != null" >
and m.account_type = #{record.accountType}
</if>
+ <if test="record.level!=null and record.level!=''">
+ and m.level=#{record.level}
+ </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">
- SELECT a.name,
+ SELECT a.id,
+ a.name,
a.phone,
a.email,
a.sex,
@@ -36,12 +56,17 @@
a.level,
a.account_status,
a.CREATED_TIME,
- c.balance,
+ IFNULL(c.balance,0) balance,
+ IFNULL(c.score,0) score,
+ IFNULL(c.prize_score,0) prizeScore,
+ d.description levelName,
b.name
FROM mall_member a
LEFT JOIN mall_member b on a.referrer_id = b.invite_id
LEFT JOIN mall_member_wallet c on c.member_id = a.id
+ LEFT JOIN data_dictionary_custom d on d.code = a.level
where a.id = #{id}
+ GROUP BY a.id
</select>
<select id="selectInfoByAccount" resultType="cc.mrbird.febs.mall.entity.MallMember">
@@ -62,16 +87,22 @@
a.name,
a.phone,
a.invite_id,
+ a.sex,
+ a.level,
2 isCurrent,
a.created_time,
- (select sum(b.amount) 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) amount,
+ p.prize_score,
+ (select sum(e.amount)
+ 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 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 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
+ 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 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
where a.referrer_id=#{inviteId}
</select>
@@ -122,8 +153,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
@@ -158,7 +188,7 @@
<select id="selectMemberParentAgentList" resultType="cc.mrbird.febs.mall.entity.MallMember">
select * from mall_member
- where level not in ('ZERO_LEVEL', 'FIRST_LEVEL') and invteId!=#{refererId} and invite_id IN
+ where level not in ('ZERO_LEVEL', 'FIRST_LEVEL') and invite_id!=#{refererId} and invite_id IN
<foreach collection = "list" item = "item" separator="," open = "(" close = ")" >
#{item}
</foreach >
@@ -196,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}
@@ -207,4 +236,307 @@
<select id="getAppVersionListInPage" resultType="cc.mrbird.febs.mall.entity.AppVersion">
select a.* from app_version a
</select>
+
+ <select id="selectByIdAndNoLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member where level != #{level}
+ <if test="refererId != null and refererId != ''">
+ and referrer_id=#{refererId}
+ </if>
+ </select>
+
+ <select id="selectMallMemberByInviteIdAndLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ SELECT
+ m.*, b.
+ VALUE
+
+ FROM
+ mall_member m
+ LEFT JOIN data_dictionary_custom b ON m. LEVEL = b. CODE
+ WHERE
+ find_in_set(#{inviteId}, m.referrer_ids)
+ 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="getAgentLevelSetInfoByMemberId" resultType="cc.mrbird.febs.mall.vo.AdminAgentLevelSetInfoVo">
+ 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'
+ GROUP BY a.id
+ </select>
+
+ <select id="getMallDataListInPage" resultType="cc.mrbird.febs.mall.vo.MallDataVo">
+ SELECT
+ DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d') createdTime,
+ IFNULL(t1.tol, 0) *- 1 AS payMoney,
+ IFNULL(t2.to2, 0) AS refundMoney,
+ IFNULL(t3.to3, 0) *- 1 AS rewordMoney,
+ (
+ (IFNULL(t1.tol, 0)*- 1) - (IFNULL(t2.to2, 0)) + (IFNULL(t3.to3, 0)*- 1)
+ ) AS surplusMoney
+ FROM
+ mall_money_flow a
+ LEFT JOIN (
+ SELECT
+ b.CREATED_TIME,
+ IFNULL(SUM(b.amount), 0) AS tol
+ FROM
+ mall_money_flow b
+ WHERE
+ b.type = 3
+ GROUP BY
+ DATE_FORMAT(b.CREATED_TIME, '%Y-%m-%d')
+ ) t1 ON DATE_FORMAT(t1.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
+ LEFT JOIN (
+ SELECT
+ c.CREATED_TIME,
+ IFNULL(SUM(c.amount), 0) AS to2
+ FROM
+ mall_money_flow c
+ WHERE
+ c.type = 4
+ GROUP BY
+ DATE_FORMAT(c.CREATED_TIME, '%Y-%m-%d')
+ ) t2 ON DATE_FORMAT(t2.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
+ LEFT JOIN (
+ SELECT
+ d.CREATED_TIME,
+ IFNULL(SUM(d.amount), 0) AS to3
+ FROM
+ mall_money_flow d
+ WHERE
+ d.type IN (1, 2)
+ GROUP BY
+ DATE_FORMAT(d.CREATED_TIME, '%Y-%m-%d')
+ ) t3 ON DATE_FORMAT(t3.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
+ GROUP BY
+ DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
+ ORDER BY
+ DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d') DESC
+ </select>
+
+<!-- <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">-->
+<!-- select a.*, b.*-->
+<!-- from mall_member a-->
+<!-- inner join (-->
+<!-- select b.referrer_id refererId, sum(a.amount) amount, max(a.order_time) orderTime-->
+<!-- from mall_order_info a-->
+<!-- inner join mall_member b on a.member_id=b.ID-->
+<!-- inner join mall_order_item c on a.id = c.order_id and c.is_normal=2-->
+<!-- where a.status in (2, 3, 4) and a.order_type=1-->
+<!-- <!– 月 –>-->
+<!-- <if test="record.query == '2'">-->
+<!-- and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')-->
+<!-- </if>-->
+<!-- group by b.referrer_id-->
+<!-- ) b on a.invite_id=b.refererId-->
+<!-- order by b.amount desc, b.orderTime desc-->
+<!-- </select>-->
+
+ <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select a.*, b.*
+ from mall_member a
+ inner join (
+ select b.referrer_id refererId, sum(a.amount) amount, max(a.pay_time) orderTime
+ from mall_achieve_record a
+ inner join mall_member b on a.member_id=b.ID
+ where 1=1
+ <!-- 月 -->
+ <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
+ ) b on a.invite_id=b.refererId
+ order by b.amount desc, b.orderTime desc
+ </select>
+
+ <select id="selectAchieveByMemberId" 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 1=1
+ <if test="type == 1">
+ and b.invite_id=#{inviteId}
+ </if>
+ <if test="type == 2">
+ and find_in_set(#{inviteId}, b.referrer_ids)
+ </if>
+ </select>
+
+ <select id="selectMemberByName" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ where name=#{name}
+ </select>
+
+ <select id="selectMemberListHasChild" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select distinct a.* from mall_member a, mall_member b
+ where a.invite_id=b.referrer_id
+ </select>
+
+ <select id="selectMemberDirectForHasLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ where referrer_id=#{inviteId} and level != 'ZERO_LEVEL'
+ </select>
+
+ <select id="selectDirectorsOrStoreMaster" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ <where>
+ 1=1
+ <if test="type == 1">
+ and director = 1
+ </if>
+ <if test="type == 2">
+ and store_master = 1
+ </if>
+ </where>
+ </select>
+
+ <select id="selectMemberWithLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ where level=#{level}
+ </select>
+
+ <select id="selectMemberIdWithLevel" resultType="java.lang.Long">
+ select id from mall_member
+ where level = #{level}
+ </select>
+
+ <select id="selectAllChildAgentListByInviteIdAndStoreMaster" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select *
+ from mall_member
+ where
+ find_in_set(#{inviteId}, referrer_ids)
+ and store_master = #{state}
+ </select>
+
+ <select id="selectMemberByDirector" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select *
+ from mall_member
+ where director = #{state}
+ </select>
+
+ <select id="selectMemberByStoreMaster" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select *
+ 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>
+
+ <select id="selectTeamListInPage" resultType="cc.mrbird.febs.mall.vo.AdminTeamListVo">
+ select
+ memberInfo.id
+ ,memberInfo.phone
+ ,memberInfo.name
+ ,memberInfo.invite_id inviteId
+ ,(select count(1) from mall_member a where a.referrer_id=memberInfo.invite_id) directCnt
+ ,(select count(1) from mall_member a where find_in_set(memberInfo.invite_id, a.referrer_ids)) teamCnt
+ ,ifnull(sum(orderInfo.amount), 0) teamOrderAmount
+ ,ifnull((select sum(b.amount) from mall_money_flow b where memberInfo.id=b.member_id and b.flow_type = 1 and b.type in (1,2,3,4,5,7)),0) selfProfitAmount
+ from mall_member memberInfo
+ left join mall_member orderMember on find_in_set(memberInfo.invite_id, orderMember.referrer_ids)
+ left join mall_order_info orderInfo on orderMember.id=orderInfo.member_id and orderInfo.status in (2, 3, 4) and orderInfo.order_type = 1
+ <where>
+ 1=1
+ <if test="record != null">
+ <if test="record.query != null and record.query != ''">
+ and (memberInfo.invite_id=#{record.query} or memberInfo.phone=#{record.query} or instr(memberInfo.name, #{record.query}))
+ </if>
+ <if test="record.referrerId != null and record.referrerId != '' and record.type == 1">
+ and memberInfo.referrer_id = #{record.referrerId}
+ </if>
+ <if test="record.referrerId != null and record.referrerId != '' and record.type == 2">
+ and find_in_set(#{record.referrerId}, memberInfo.referrer_ids)
+ </if>
+ </if>
+ </where>
+ group by memberInfo.id
+ order by teamOrderAmount desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1