From 11e160c6ac65cba824596b0f4b718d766878ed82 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 03 Jan 2025 17:37:47 +0800 Subject: [PATCH] fix(mall): 修复跑级计算错误 --- src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 34 ++++++++-------------------------- 1 files changed, 8 insertions(+), 26 deletions(-) diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml index 6840259..2af071d 100644 --- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml +++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml @@ -9,30 +9,14 @@ <select id="selectApiMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo"> select - a.*, - case when a.rt_member_id is null then (select n.phone from mall_member n where n.id=a.member_id) - when a.rt_member_id is not null then (select m.phone from mall_member m where m.id=a.rt_member_id) - end phone, - c.description memberLevel + a.* from mall_money_flow a - left join mall_member b on a.rt_member_id=b.id - left join data_dictionary_custom c on b.level = c.code and c.type='AGENT_LEVEL' <where> - 1=1 and a.status = 2 - <if test="record.inOrOut == 3"> - and a.amount > 0 - </if> - <if test="record.inOrOut == 2"> - and 0 > a.amount - </if> <if test="record.memberId != null"> and a.member_id=#{record.memberId} </if> <if test="record.flowType != null and record.flowType != ''"> and a.flow_type=#{record.flowType} - </if> - <if test="record.type != null and record.type != ''"> - and a.type=#{record.type} </if> </where> order by a.created_time desc @@ -42,14 +26,12 @@ select a.*, b.name, - b.bind_phone bindPhone, - c.pay_method payMethod, - b.phone + b.phone, + (select phone from mall_member where id = a.rt_member_id) rtPhone from mall_money_flow a inner join mall_member b on a.member_id=b.id - left join mall_order_info c on a.order_no = c.order_no <where> - 1=1 and a.status = 2 + 1=1 <if test="record != null" > <if test="record.name!=null and record.name!=''"> and b.name like concat('%', #{record.name},'%') @@ -57,11 +39,11 @@ <if test="record.phone!=null and record.phone!=''"> and b.phone like concat('%', #{record.phone},'%') </if> - <if test="record.type!=null and record.type!=''"> - and a.type like concat('%', #{record.type},'%') + <if test="record.type!=null"> + and a.type = #{record.type} </if> - <if test="record.flowType!=null and record.flowType!=''"> - and a.flow_type like concat('%', #{record.flowType},'%') + <if test="record.flowType!=null"> + and a.flow_type = #{record.flowType} </if> <if test="record.startTime != null and record.startTime != ''"> and a.created_time >= #{record.startTime} -- Gitblit v1.9.1