diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberAchieveMapper.xml
new file mode 100644
index 00000000..4a5437ef
--- /dev/null
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberAchieveMapper.xml
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ pk_id NUMBER(20) primary key,
+ period number(6) not null,
+ pk_member NUMBER(20) not null,
+ pk_rate NUMBER(6) not null,
+ a_balance NUMBER(17,6) default 0 not null,
+ b_balance NUMBER(17,6) default 0 not null,
+ a_sum_amount NUMBER(17,6) default 0 not null,
+ b_sum_amount NUMBER(17,6) default 0 not null,
+ a_sum_pv NUMBER(17,6) default 0 not null,
+ b_sum_pv NUMBER(17,6) default 0 not null,
+ a_new_amount NUMBER(17,6) default 0 not null,
+ b_new_amount NUMBER(17,6) default 0 not null,
+ a_new_pv NUMBER(17,6) default 0 not null,
+ b_new_pv NUMBER(17,6) default 0 not null,
+ a_sum_real_amount NUMBER(17,6) default 0 not null,
+ b_sum_real_amount NUMBER(17,6) default 0 not null,
+ a_sum_real_pv NUMBER(17,6) default 0 not null,
+ b_sum_real_pv NUMBER(17,6) default 0 not null,
+ rep_a_balance NUMBER(17,6) default 0 not null,
+ rep_b_balance NUMBER(17,6) default 0 not null,
+ rep_a_new_amount NUMBER(17,6) default 0 not null,
+ rep_b_new_amount NUMBER(17,6) default 0 not null,
+ rep_a_new_pv NUMBER(17,6) default 0 not null,
+ rep_b_new_pv NUMBER(17,6) default 0 not null,
+ rep_a_sum_amount NUMBER(17,6) default 0 not null,
+ rep_b_sum_amount NUMBER(17,6) default 0 not null,
+ rep_a_sum_pv NUMBER(17,6) default 0 not null,
+ rep_b_sum_pv NUMBER(17,6) default 0 not null,
+ register_amount NUMBER(17,6) default 0 not null,
+ register_pv NUMBER(17,6) default 0 not null,
+ register_new_amount NUMBER(17,6) default 0 not null,
+ register_new_pv NUMBER(17,6) default 0 not null,
+ upgrade_amount NUMBER(17,6) default 0 not null,
+ upgrade_pv NUMBER(17,6) default 0 not null,
+ upgrade_new_amount NUMBER(17,6) default 0 not null,
+ upgrade_new_pv NUMBER(17,6) default 0 not null,
+ repurchase_amount NUMBER(17,6) default 0 not null,
+ repurchase_pv NUMBER(17,6) default 0 not null,
+ repurchase_new_amount NUMBER(17,6) default 0 not null,
+ repurchase_new_pv NUMBER(17,6) default 0 not null,
+ hi_fun_amount NUMBER(17,6) default 0 not null,
+ hi_fun_pv NUMBER(17,6) default 0 not null,
+ hi_fun_new_amount NUMBER(17,6) default 0 not null,
+ hi_fun_new_pv NUMBER(17,6) default 0 not null,
+ mall_amount NUMBER(17,6) default 0 not null,
+ mall_pv NUMBER(17,6) default 0 not null,
+ mall_new_amount NUMBER(17,6) default 0 not null,
+ mall_new_pv NUMBER(17,6) default 0 not null,
+ REGISTER_Blo_NEW_PV NUMBER(17,6) default 0 not null,
+ UPGRADE_Blo_NEW_PV NUMBER(17,6) default 0 not null,
+ REPURCHASE_Blo_NEW_PV NUMBER(17,6) default 0 not null,
+ HI_FUN_Blo_NEW_PV NUMBER(17,6) default 0 not null,
+ MALL_Blo_NEW_PV NUMBER(17,6) default 0 not null,
+ r_a_balance NUMBER(17,6) default 0 not null,
+ r_b_balance NUMBER(17,6) default 0 not null,
+ r_a_sum_amount NUMBER(17,6) default 0 not null,
+ r_b_sum_amount NUMBER(17,6) default 0 not null,
+ r_a_sum_pv NUMBER(17,6) default 0 not null,
+ r_b_sum_pv NUMBER(17,6) default 0 not null,
+ r_a_sum_real_amount NUMBER(17,6) default 0 not null,
+ r_b_sum_real_amount NUMBER(17,6) default 0 not null,
+ r_a_sum_real_pv NUMBER(17,6) default 0 not null,
+ r_b_sum_real_pv NUMBER(17,6) default 0 not null,
+ r_rep_a_balance NUMBER(17,6) default 0 not null,
+ r_rep_b_balance NUMBER(17,6) default 0 not null,
+ r_rep_a_sum_amount NUMBER(17,6) default 0 not null,
+ r_rep_b_sum_amount NUMBER(17,6) default 0 not null,
+ r_rep_a_sum_pv NUMBER(17,6) default 0 not null,
+ r_rep_b_sum_pv NUMBER(17,6) default 0 not null,
+ pk_country NUMBER(6) not null
+
+
+
+ create table ${tableName}
+ (
+
+ )
+
+
+
+ create table ${tableName}
+ (
+ pk_member NUMBER(20) not null,
+ pk_parent NUMBER(20) not null,
+ pk_place_parent NUMBER(20),
+ place_dept NUMBER(3),
+ member_code VARCHAR2(30) not null,
+ member_name VARCHAR2(100) not null,
+ customer_type NUMBER(2) not null,
+ phone VARCHAR2(40) not null,
+ pk_grade NUMBER(4) not null,
+ pk_awards NUMBER(4) not null,
+ pk_team_code NUMBER(20),
+ pk_center_code NUMBER(20),
+ pk_vertex NUMBER(20) default 1,
+ pk_settle_country NUMBER(4) not null,
+ a_sum_pv NUMBER(17,6) default 0 not null,
+ b_sum_pv NUMBER(17,6) default 0 not null,
+ rep_a_sum_pv NUMBER(17,6) default 0 not null,
+ rep_b_sum_pv NUMBER(17,6) default 0 not null,
+ register_pv NUMBER(17,6) default 0 not null,
+ upgrade_pv NUMBER(17,6) default 0 not null,
+ repurchase_pv NUMBER(17,6) default 0 not null,
+ hi_fun_pv NUMBER(17,6) default 0 not null,
+ mall_pv NUMBER(17,6) default 0 not null
+ )
+
+
+ merge into cu_member_month${date} a
+ using(
+ select a.*,b.A_SUM_PV,b.b_SUM_PV,b.REGISTER_PV,b.UPGRADE_PV,
+ b.REPURCHASE_PV,b.HI_FUN_PV,b.MALL_PV from(
+ select ct.pk_member,ct.pk_parent,ct.pk_place_parent,ct.place_dept,ct.member_code,ct.member_name,
+ ct.customer_type,ct.phone,ct.pk_grade,ct.pk_awards,ct.pk_team_code,ct.pk_center_code,
+ ct.pk_vertex,ct.pk_settle_country from cu_member_tree${date} ct where period=#{period}) a
+ inner join(
+ select pk_member,sum(A_NEW_PV+REP_A_NEW_PV) A_SUM_PV,sum(b_NEW_PV+REP_B_NEW_PV) b_SUM_PV,
+ sum(register_new_pv) REGISTER_PV,sum(upgrade_new_pv) UPGRADE_PV,sum(repurchase_new_pv) REPURCHASE_PV,
+ sum(hi_fun_new_pv) HI_FUN_PV,sum(mall_new_pv) MALL_PV from cu_member_achieve${date}
+ group by pk_member) b
+ on a.pk_member=b.pk_member
+ ) b
+ on (a.pk_member=b.pk_member)
+ when matched then
+ update set
+ a.pk_parent=b.pk_parent,a.pk_place_parent=b.pk_place_parent,a.place_dept=b.place_dept,
+ a.member_code=b.member_code,a.member_name=b.member_name,a.customer_type=b.customer_type,
+ a.phone=b.phone,a.pk_grade=b.pk_grade,a.pk_awards=b.pk_awards,a.pk_team_code=b.pk_team_code,
+ a.pk_center_code=b.pk_center_code,a.pk_vertex=b.pk_vertex,a.pk_settle_country=b.pk_settle_country,
+ a.A_SUM_PV=b.A_SUM_PV,a.b_SUM_PV=b.b_SUM_PV,
+ a.REGISTER_PV=b.REGISTER_PV,a.UPGRADE_PV=b.UPGRADE_PV,
+ a.REPURCHASE_PV =b.REPURCHASE_PV,a.HI_FUN_PV=b.HI_FUN_PV,a.MALL_PV=b.MALL_PV
+ WHEN NOT MATCHED THEN
+ insert(pk_member,pk_parent,pk_place_parent,place_dept,member_code,
+ member_name,customer_type,phone,pk_grade,pk_awards,pk_team_code,
+ pk_center_code,pk_vertex,pk_settle_country,a_sum_pv,b_sum_pv,
+ register_pv,upgrade_pv,repurchase_pv,
+ hi_fun_pv,mall_pv)
+ values (b.pk_member,b.pk_parent,b.pk_place_parent,b.place_dept,b.member_code,
+ b.member_name,b.customer_type,b.phone,b.pk_grade,b.pk_awards,b.pk_team_code,
+ b.pk_center_code,b.pk_vertex,b.pk_settle_country,b.a_sum_pv,b.b_sum_pv,
+ b.register_pv,b.upgrade_pv,b.repurchase_pv,
+ b.hi_fun_pv,b.mall_pv)
+
+
+ merge into ${targetTable} a
+ using (
+ select pk_member,max(a.pk_rate) pk_rate,sum(a_new_amount/bc.out_exchange_rate) a_new_amount,sum(a_new_pv)
+ a_new_pv,
+ sum(b_new_amount/bc.out_exchange_rate) b_new_amount,sum(b_new_pv) b_new_pv,
+ sum(rep_a_new_amount/bc.out_exchange_rate) rep_a_new_amount,sum(rep_b_new_amount/bc.out_exchange_rate)
+ rep_b_new_amount,
+ sum(rep_a_new_pv) rep_a_new_pv,sum(rep_b_new_pv) rep_b_new_pv,sum(a_new_real_amount/bc.out_exchange_rate)
+ a_new_real_amount,
+ sum(a_new_real_pv) a_new_real_pv,sum(b_new_real_amount/bc.out_exchange_rate)
+ b_new_real_amount,sum(b_new_real_pv) b_new_real_pv
+ from (
+ select pk_place_parent pk_member,#{achieve.pkRate} pk_rate,
+ (case when place_dept =1 then #{achieve.newAmount} else 0 end) a_new_amount,
+ (case when place_dept =1 then #{achieve.newPv} else 0 end) a_new_pv,
+ (case when place_dept =1 then #{achieve.repNewAmount} else 0 end) rep_a_new_amount,
+ (case when place_dept =1 then #{achieve.repNewPv} else 0 end) rep_a_new_pv,
+ (case when place_dept =1 then #{achieve.newRealAmount} else 0 end) a_new_real_amount,
+ (case when place_dept =1 then #{achieve.newRealPv} else 0 end) a_new_real_pv,
+ (case when place_dept =2 then #{achieve.newAmount} else 0 end) b_new_amount,
+ (case when place_dept =2 then #{achieve.newPv} else 0 end) b_new_pv,
+ (case when place_dept =2 then #{achieve.repNewAmount} else 0 end) rep_b_new_amount,
+ (case when place_dept =2 then #{achieve.repNewPv} else 0 end) rep_b_new_pv,
+ (case when place_dept =2 then #{achieve.newRealAmount} else 0 end) b_new_real_amount,
+ (case when place_dept =2 then #{achieve.newRealPv} else 0 end) b_new_real_pv
+ from(
+ select pk_place_parent,place_dept from(
+ select * from(select * from ${sourceTable}
+ where period= #{period} )
+ start with pk_member = #{achieve.pkMember}
+ connect by pk_member = prior pk_place_parent
+ )
+ where nvl(pk_place_parent,0) !=0
+ )
+ ) a
+ inner join bd_currency bc
+ on a.pk_rate = bc.pk_id
+ group by pk_member
+ ) b
+ on (a.pk_member = b.pk_member)
+ when matched then
+ update set
+ a.a_sum_amount = a.a_sum_amount - b.a_new_amount,
+ a.b_sum_amount = a.b_sum_amount - b.b_new_amount,
+ a.a_sum_pv = a.a_sum_pv - b.a_new_pv,
+ a.b_sum_pv = a.b_sum_pv - b.b_new_pv,
+ a.rep_a_sum_amount = a.rep_a_sum_amount - b.rep_a_new_amount,
+ a.rep_b_sum_amount = a.rep_b_sum_amount - b.rep_b_new_amount,
+ a.rep_a_sum_pv = a.rep_a_sum_pv - b.rep_a_new_pv,
+ a.rep_b_sum_pv = a.rep_b_sum_pv - b.rep_b_new_pv,
+ a.a_sum_real_amount = a.a_sum_real_amount - b.a_new_amount - b.rep_a_new_amount,
+ a.b_sum_real_amount = a.b_sum_real_amount - b.b_new_amount - b.rep_b_new_amount,
+ a.a_sum_real_pv = a.a_sum_real_pv - b.a_new_pv - b.rep_a_new_pv,
+ a.b_sum_real_pv = a.b_sum_real_pv - b.b_new_pv - b.rep_b_new_pv,
+ a.r_a_sum_amount = a.r_a_sum_amount - b.a_new_amount,
+ a.r_b_sum_amount = a.r_b_sum_amount - b.b_new_amount,
+ a.r_a_sum_pv = a.r_a_sum_pv - b.a_new_pv,
+ a.r_b_sum_pv = a.r_b_sum_pv - b.b_new_pv,
+ a.r_rep_a_sum_amount =a.r_rep_a_sum_amount - b.rep_a_new_amount,
+ a.r_rep_b_sum_amount =a.r_rep_b_sum_amount - b.rep_b_new_amount,
+ a.r_rep_a_sum_pv = a.r_rep_a_sum_pv - b.rep_a_new_pv,
+ a.r_rep_b_sum_pv = a.r_rep_b_sum_pv - b.rep_b_new_pv,
+ a.r_a_sum_real_amount = a.r_a_sum_real_amount - b.a_new_amount - b.rep_a_new_amount,
+ a.r_b_sum_real_amount = a.r_b_sum_real_amount - b.b_new_amount - b.rep_b_new_amount,
+ a.r_a_sum_real_pv = a.r_a_sum_real_pv - b.a_new_pv - b.rep_a_new_pv,
+ a.r_b_sum_real_pv = a.r_b_sum_real_pv - b.b_new_pv - b.rep_b_new_pv
+
+
+
+ merge into ${targetTable} a
+ using(select pk_member,a_balance,b_balance,min_achieve,round,second from ${sourceTable}) b
+ on (a.pk_member = b.pk_member)
+ when matched then
+ update set
+ a.a_balance=b.a_balance,a.b_balance=b.b_balance,
+ a.min_achieve=b.min_achieve,a.round=b.round,a.second=b.second
+
+
+
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java
index 476ccd1c..64a5263e 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java
@@ -17,9 +17,6 @@ import java.util.List;
/**
* 会员业绩记录 Mapper 接口
- *
- * @author hzs
- * @since 2022-10-26
*/
public interface CuMemberAchieveMapper extends BaseMapper {
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml
index 8018e415..757bdcc0 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml
@@ -70,7 +70,6 @@
-
diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberAchieveMapper.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberAchieveMapper.java
index 378a62a5..38a4d5ee 100644
--- a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberAchieveMapper.java
+++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberAchieveMapper.java
@@ -8,9 +8,6 @@ import java.util.List;
/**
* 会员业绩记录 Mapper 接口
- *
- * @author hzs
- * @since 2022-10-26
*/
public interface CuMemberAchieveMapper extends BaseMapper {
diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/report/CuMemberAchieveMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/report/CuMemberAchieveMapper.xml
index b522976c..42957025 100644
--- a/bd-business/bd-business-report/src/main/resources/mapper/report/report/CuMemberAchieveMapper.xml
+++ b/bd-business/bd-business-report/src/main/resources/mapper/report/report/CuMemberAchieveMapper.xml
@@ -70,7 +70,6 @@
-