From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Thu, 15 Jun 2023 11:16:11 +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/MallMoneyFlowMapper.xml | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml index dcfaea2..8d69468 100644 --- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml +++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml @@ -51,7 +51,7 @@ b.phone, d.name fromMemberName from mall_money_flow a - left join mall_member b on a.member_id=b.id + inner join mall_member b on a.member_id=b.id left join mall_order_info c on a.order_no = c.order_no left join mall_member d on d.id = a.rt_member_id <where> @@ -67,6 +67,12 @@ </if> <if test="record.flowType!=null and record.flowType!=''"> and a.flow_type like concat('%', #{record.flowType},'%') + </if> + <if test="record.referrerId!=null and record.referrerId!=''"> + and find_in_set(#{record.referrerId}, b.referrer_ids) + </if> + <if test="record.inviteId!=null and record.inviteId!=''"> + and b.invite_id = #{record.inviteId} </if> </if> </where> @@ -271,4 +277,16 @@ </where> order by a.created_time desc </select> + + <select id="selectMemberProfitByMemberIds" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow"> + select memberInfo.id memberId, ifnull(sum(flowInfo.amount),0) amount from mall_member memberInfo + inner join mall_member flowMember on find_in_set(memberInfo.invite_id, flowMember.referrer_ids) + inner join mall_money_flow flowInfo on flowMember.id=flowInfo.member_id and flowInfo.flow_type = 1 and flowInfo.type in (1,2,3,4,5,7) + <where> + memberInfo.id in <foreach collection="list" item="item" separator="," open="(" close=")"> + #{item} + </foreach> + </where> + group by memberInfo.id + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.1