diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java index f53789a6..3a066cbf 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java @@ -38,293 +38,28 @@ public class BonusTotalVO implements Serializable { */ private Integer pkCountry; - /** - * 新零售直推收益 + * 注册直推收益-众康 */ @Excel(name = "直推收益", scale = 2) - private BigDecimal retailRangeIncome; + private BigDecimal directIncome; /** - * 新零售平级收益 + * 阶段收益-众康 */ - @Excel(name = "平级收益", scale = 2) - private BigDecimal retailSameLevelIncome; + @Excel(name = "阶段收益", scale = 2) + private BigDecimal storeIncome; /** - * 新零售区域分红 + * 复购见点收益-众康 */ - @Excel(name = "区域分红", scale = 2) - private BigDecimal retailAreaIncome; - - /** - * 新零售福利级差收益 - */ - @Excel(name = "月度福利级差收益", scale = 2) - private BigDecimal retailBenefitRangeIncome; - - /** - * 新零售复购级差收益 - */ - @Excel(name = "月度复购级差收益", scale = 2) - private BigDecimal retailMonthRepurchaseIncome; - - /** - * 培育津贴 - */ - @Excel(name = "培育津贴", scale = 2) - private BigDecimal coachIncome; - - /** - * 福利分红平均收益 - */ - @Excel(name = "福利分红平均收益", scale = 2) - private BigDecimal retailBenefitAvgIncome; - - /** - * 福利分红加权收益 - */ - @Excel(name = "福利分红加权收益", scale = 2) - private BigDecimal retailBenefitIncome; - - /** - * 复购级差收益 - */ - @Excel(name = "复购级差收益", scale = 2) - private BigDecimal repurRangeIncome; - - /** - * 重消收益 - */ - @Excel(name = "重消收益", scale = 2) - private BigDecimal backPoints; + @Excel(name = "见点收益", scale = 2) + private BigDecimal globalPoints; /** * 实发收益总计 */ @Excel(name = "实发收益总计", scale = 2) - private BigDecimal realIncomeTotal; - - - /** - * 直推收益 - */ - private BigDecimal directIncomeOri; - - /** - * 拓展收益 - */ - private BigDecimal expandIncomeOri; - - /** - * 拓展无封 (拓展收益按等级正常比例结算,并 拓展收益按等级正常比例结算 无封顶) - */ - private BigDecimal expandNoCappingOri; - - /** - * 拓展封顶 (拓展收益按等级正常比例结算,不按4-N结算,根据配置的封顶值限制最大收益) - */ - private BigDecimal expandCappingOri; - - /** - * 辅导收益 - */ - private BigDecimal coachIncomeOri; - - /** - * 分红收益 - */ - private BigDecimal shareIncomeOri; - - /** - * 报单收益 - */ - private BigDecimal serviceIncomeOri; - - - /** - * 云代直推收益 - */ - private BigDecimal cloudDirectIncomeOri; - - /** - * 云代首购收益 - */ - private BigDecimal cloudPurIncomeOri; - - /** - * 云代复购收益 - */ - private BigDecimal cloudRepurIncomeOri; - - private BigDecimal repurPushIncomeOri; - - /** - * 复购拓展收益 - */ - private BigDecimal repurExpandIncomeOri; - - /** - * 复购券 - */ - private BigDecimal repurCouponOri; - - /** - * 复购券均分收益 - */ - private BigDecimal repurCouponShareOri; - - /** - * 平台服务费 - */ - private BigDecimal serviceSpendOri; - - /** - * 环球积分 - */ - private BigDecimal globalPointsOri; - - /** - * 车奖积分 - */ - private BigDecimal carAwardPointsOri; - - /** - * 店铺收益 - */ - private BigDecimal storeIncomeOri; - - /** - * 嗨粉推荐收益 - */ - private BigDecimal hiFunIncomeOri; - - /** - * 首购实发小计 - */ - private BigDecimal purRealSubtotalOri; - - /** - * 云代实发小计 - */ - private BigDecimal cloudRealSubtotalOri; - - /** - * 复购实发小计 - */ - private BigDecimal repurRealSubtotalOri; - - /** - * 复购券小计 - */ - private BigDecimal repurCouponSubtotalOri; - - /** - * 直推收益 - */ - private BigDecimal directIncome; - - /** - * 拓展收益 - */ - private BigDecimal expandIncome; - - /** - * 拓展无封 (拓展收益按等级正常比例结算,并 拓展收益按等级正常比例结算 无封顶) - */ - private BigDecimal expandNoCapping; - - /** - * 拓展封顶 (拓展收益按等级正常比例结算,不按4-N结算,根据配置的封顶值限制最大收益) - */ - private BigDecimal expandCapping; - - - /** - * 分红收益 - */ - private BigDecimal shareIncome; - - /** - * 报单收益 - */ - private BigDecimal serviceIncome; - - /** - * 云代直推收益 - */ - private BigDecimal cloudDirectIncome; - - /** - * 云代首购收益 - */ - private BigDecimal cloudPurIncome; - - /** - * 云代复购收益 - */ - private BigDecimal cloudRepurIncome; - - private BigDecimal repurPushIncome; - - /** - * 复购拓展收益 - */ - private BigDecimal repurExpandIncome; - - /** - * 复购券 - */ - private BigDecimal repurCoupon; - - /** - * 复购券均分收益 - */ - private BigDecimal repurCouponShare; - - /** - * 平台服务费 - */ - private BigDecimal serviceSpend; - - /** - * 环球积分 - */ - private BigDecimal globalPoints; - - /** - * 车奖积分 - */ - private BigDecimal carAwardPoints; - - /** - * 店铺收益 - */ - private BigDecimal storeIncome; - - /** - * 嗨粉推荐收益 - */ - private BigDecimal hiFunIncome; - - /** - * 首购实发小计 - */ - private BigDecimal purRealSubtotal; - - /** - * 云代实发小计 - */ - private BigDecimal cloudRealSubtotal; - - /** - * 复购实发小计 - */ - private BigDecimal repurRealSubtotal; - - /** - * 复购券小计 - */ - private BigDecimal repurCouponSubtotal; + private BigDecimal realIncomeTotalOri; } diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml index e0df1b68..6eb23f1a 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml @@ -375,6 +375,7 @@ nvl( sum( cb.direct_income ), 0 ) direct_income, nvl( sum( cb.store_income ), 0 ) store_income, nvl( sum( cb.global_points ), 0 ) global_points, + sum(cb.real_income_total) real_income_total, bc.out_exchange_rate from cu_member_bonus cb inner join cu_member cm @@ -446,26 +447,10 @@