From d66b56ab02e7e8c4157acc445acc19bb9ad20f04 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 3 Jul 2025 10:06:01 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=85=BC=E5=AE=B9oracle=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=A4=84=E7=90=86=E6=88=900=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../achieve/CuMemberRetailRangeMapper.xml | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml index 875225af..90f5c15e 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml @@ -680,36 +680,36 @@ a.pk_share_awards, cm.income_status, cm.pay_time, - nvl(b.pk_rate, bt.pk_id) pk_rate, - nvl(cm.is_activate, a.enable_status) enable_status, + nvl(b.pk_rate, bt.pk_id) pk_rate, + nvl(cm.is_activate, a.enable_status) enable_status, a.new_box_num, - nvl(b.consume_box_num, 0) + a.new_box_num consume_box_num, - nvl(b.month_box_num, 0) + a.new_box_num month_box_num, + nvl(b.consume_box_num, 0) + nvl(a.new_box_num, 0) consume_box_num, + nvl(b.month_box_num, 0) + nvl(a.new_box_num, 0) month_box_num, a.new_consume_pv, - nvl(b.consume_pv, 0) + a.new_consume_pv consume_pv, - nvl(b.month_consume_pv, 0) + a.new_consume_pv month_consume_pv, + nvl(b.consume_pv, 0) + nvl(a.new_consume_pv, 0) consume_pv, + nvl(b.month_consume_pv, 0) + nvl(a.new_consume_pv, 0) month_consume_pv, a.team_new_box_num, - nvl(b.team_box_num, 0) + a.team_new_box_num team_box_num, - nvl(b.team_month_box_num, 0) + a.team_new_box_num team_month_box_num, + nvl(b.team_box_num, 0) + nvl(a.team_new_box_num, 0) team_box_num, + nvl(b.team_month_box_num, 0) + nvl(a.team_new_box_num, 0) team_month_box_num, a.team_new_pv, - nvl(b.team_consume_pv, 0) + a.team_new_pv team_consume_pv, - nvl(b.team_month_pv, 0) + a.team_new_pv team_month_pv, + nvl(b.team_consume_pv, 0) + nvl(a.team_new_pv, 0) team_consume_pv, + nvl(b.team_month_pv, 0) + nvl(a.team_new_pv, 0) team_month_pv, a.team_new_amount, - nvl(b.team_consume_amount, 0) + a.team_new_amount team_consume_amount, - nvl(b.team_month_amount, 0) + a.team_new_amount team_month_amount, - nvl(b.big_box_num, 0) big_box_num, - nvl(b.small_box_num, 0) small_box_num, - nvl(b.big_team_pv, 0) big_team_pv, - nvl(b.small_team_pv, 0) small_team_pv, + nvl(b.team_consume_amount, 0) + nvl(a.team_new_amount, 0) team_consume_amount, + nvl(b.team_month_amount, 0) + nvl(a.team_new_amount, 0) team_month_amount, + nvl(b.big_box_num, 0) big_box_num, + nvl(b.small_box_num, 0) small_box_num, + nvl(b.big_team_pv, 0) big_team_pv, + nvl(b.small_team_pv, 0) small_team_pv, a.system_type, a.all_new_box_num, a.all_new_consume_pv, a.all_team_new_box_num, a.all_team_new_pv, - nvl(b.all_team_box_num, 0) + a.all_team_new_box_num all_team_box_num, - nvl(b.all_team_month_box_num, 0) + a.all_team_new_pv all_team_month_box_num, - nvl(b.all_team_consume_pv, 0) + a.all_team_new_box_num all_team_consume_pv, - nvl(b.all_team_month_pv, 0) + a.all_team_new_pv all_team_month_pv, + nvl(b.all_team_box_num, 0) + nvl(a.all_team_new_box_num, 0) all_team_box_num, + nvl(b.all_team_month_box_num, 0) + nvl(a.all_team_new_pv, 0) all_team_month_box_num, + nvl(b.all_team_consume_pv, 0) + nvl(a.all_team_new_box_num, 0) all_team_consume_pv, + nvl(b.all_team_month_pv, 0) + nvl(a.all_team_new_pv, 0) all_team_month_pv, bg.grade_value, bg.grade_name, bw.awards_value, @@ -718,9 +718,9 @@ bw.month_repurchase_ratio, bw.benefit_avg_ratio, bw.benefit_share_ratio, - bws.awards_value share_awards_value, - br.name country_name, - cr.county region_address, + bws.awards_value share_awards_value, + br.name country_name, + cr.county region_address, bv.region_vertex_pk_id from ( select * @@ -749,18 +749,18 @@