diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java index b88b4b88..29b868b8 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java @@ -191,6 +191,8 @@ public class CuBonusStatisServiceImpl extends ServiceImpl existingRecord = getCuBonusStatis(bs); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java index 72fe07d2..c4c95cfd 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java @@ -235,6 +235,8 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl * 奖金拨比统计 * 每个团队,每天一条数据 * 数据来自 订单表奖金明细表 会员奖金-会员奖金汇总表 - *

- * - * @author zhangjing - * @since 2023-05-31 */ @Data public class CuBonusVertexStatisVO { @@ -743,5 +738,13 @@ public class CuBonusVertexStatisVO { */ private int period; + /** + * 拓展首购金额 + */ + private BigDecimal calFirAchieve; + /** + * 拓展复购金额 + */ + private BigDecimal calRepAchieve; } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml index 96095188..e1dc373b 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml @@ -1234,7 +1234,8 @@ sum(mbp.REAL_INCOME) realIncome, bbi.BONUS_VALUE bonusType, cm.PK_VERTEX pkVertex, - to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime + to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime, + 0, 0 from cu_member_bonus_push mbp inner join CU_MEMBER_BONUS cmb on mbp.PK_BONUS = cmb.pk_id inner join cu_member cm on cm.pk_id = cmb.pk_member @@ -1261,7 +1262,8 @@ sum(mbe.REAL_INCOME) realIncome, bbi.BONUS_VALUE bonusType, cm.PK_VERTEX pkVertex, - to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime + to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime, + sum(mbe.cal_fir_achieve) cal_fir_achieve, sum(mbe.cal_rep_achieve) cal_rep_achieve from CU_MEMBER_BONUS_EXPAND mbe INNER JOIN CU_MEMBER_BONUS cmb on mbe.PK_BONUS = cmb.pk_id INNER join cu_member cm on cm.pk_id = cmb.pk_member @@ -1289,7 +1291,8 @@ sum(mbc.REAL_INCOME) realIncome, bbi.BONUS_VALUE bonusType, cm.PK_VERTEX pkVertex, - to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime + to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime, + 0, 0 from CU_MEMBER_BONUS_COACH mbc inner join CU_MEMBER_BONUS cmb on mbc.PK_BONUS = cmb.pk_id inner join cu_member cm on cm.pk_id = cmb.pk_member @@ -1317,7 +1320,8 @@ sum(mbr.REAL_INCOME) realIncome, bbi.BONUS_VALUE bonusType, cm.PK_VERTEX pkVertex, - to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime + to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime, + 0, 0 from cu_member_bonus_range mbr INNER JOIN CU_MEMBER_BONUS cmb on mbr.PK_BONUS=cmb.pk_id INNER join cu_member cm on cm.pk_id = cmb.pk_member @@ -1344,7 +1348,8 @@ sum(mbd.REAL_INCOME) realIncome, bbi.BONUS_VALUE bonusType, cm.PK_VERTEX pkVertex, - to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime + to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime, + 0, 0 from cu_member_bonus_detail mbd INNER JOIN CU_MEMBER_BONUS cmb on mbd.PK_BONUS=cmb.pk_id INNER join cu_member cm on cm.pk_id = cmb.pk_member diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml index 6299fa12..ab964150 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml @@ -2,77 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CREATION_TIME - , - PK_COUNTRY, - DEL_FLAG, - PK_ID, STATIS_TYPE, PERIOD, START_DATE, END_DATE, MAIN_REG_AMOUNT, MAIN_UP_AMOUNT, MAIN_REPUR_AMOUNT, HIFANS_REG_AMOUNT, INTRODUCE_BONUS, ORG_BONUS, LEADER_BONUS, SHARE_BONUS, SERVICE_BONUS, HI_FUN_INCOME, REPUR_RANGE_BONUS, REPUR_ORG_BONUS, MAIN_BONUS, REPUR_BONUS, PK_BD_VERTEX, PK_TEAM_CODE, HAI_FUN_INCOME, GIFT_ORDER, SPECIAL_REGISTER_AMOUNT, SPECIAL_UPGRADE_AMOUNT, CLOUD_COLLEGE_AMOUNT, MALL_AMOUNT, MAKER_GIFT_AMOUNT, EMPOWERMENT_GIFT_AMOUNT, COOPERATE_AMOUNT, SPECIAL_REPURCHASE_AMOUNT, HAI_FUN_UPGRADE_AMOUNT, REPUR_PUSH_INCOME, MAKER_DIRECT, MAKER_SHARE, THIRD_ORDER, FICTITIOUS_AMOUNT, MAKER_ORDER, WELFARE_ORDER, MAIN_REG_PV, MAIN_UP_PV, MAIN_REPUR_PV, SPECIAL_REGISTER_PV, SPECIAL_UPGRADE_PV, SPECIAL_REPURCHASE_PV, FICTITIOUS_PV, HIFANS_REG_PV, HAI_FUN_UPGRADE_PV, CLOUD_COLLEGE_PV, MALL_PV, EMPOWERMENT_GIFT_PV, COOPERATE_PV, MAKER_ORDER_PV, MAKER_GIFT_PV, WELFARE_ORDER_PV - -