diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java index 0e7cfaa5..a6e17c44 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java @@ -1,6 +1,7 @@ package com.hzs.bonus.bonus.vo; import com.hzs.common.core.annotation.BigDecimalFormat; +import com.hzs.common.core.annotation.Excel; import lombok.*; import java.math.BigDecimal; @@ -15,116 +16,34 @@ import java.math.BigDecimal; @NoArgsConstructor public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO { -// /** -// * 直推收益 -// */ -// private BigDecimal directIncome; -// -// /** -// * 拓展收益 -// */ -// private BigDecimal expandIncome; -// -// /** -// * 分红收益 -// */ -// private BigDecimal shareIncome; -// -// /** -// * 报单收益 -// */ -// private BigDecimal serviceIncome; + /** + * 注册直推收益-众康 + */ + @BigDecimalFormat + private BigDecimal directIncome; /** - * 商城重消 + * 阶段收益-众康 */ - @BigDecimalFormat("#0.00") - private BigDecimal backPoints; -// -// /** -// * 首购实发小计 -// */ -// private BigDecimal purRealSubtotal; -// -// /** -// * 复购推荐收益 -// */ -// private BigDecimal repurPushIncome; -// -// /** -// * 复购拓展收益 -// */ -// private BigDecimal repurExpandIncome; + @BigDecimalFormat + private BigDecimal storeIncome; /** - * 复购级差收益 + * 复购见点收益-众康 */ - @BigDecimalFormat("#0.00") - private BigDecimal repurRangeIncome; - -// /** -// * 复购实发小计 -// */ -// private BigDecimal repurRealSubtotal; -// -// /** -// * 乐学直推收益 -// */ -// private BigDecimal globalPoints; - - - /** - * 新零售直推收益 - */ - @BigDecimalFormat("#0.00") - private BigDecimal retailRangeIncome; - - /** - * 新零售平级收益 - */ - @BigDecimalFormat("#0.00") - private BigDecimal retailSameLevelIncome; - - /** - * 新零售区域分红 - */ - @BigDecimalFormat("#0.00") - private BigDecimal retailAreaIncome; - - /** - * 福利级差收益 - */ - @BigDecimalFormat("#0.00") - private BigDecimal retailBenefitRangeIncome; - - /** - * 复购级差收益 - */ - @BigDecimalFormat("#0.00") - private BigDecimal retailMonthRepurchaseIncome; - - /** - * 培育津贴 - */ - @BigDecimalFormat("#0.00") - private BigDecimal coachIncome; - - /** - * 福利分红收益总计 - */ - @BigDecimalFormat("#0.00") - private BigDecimal retailBenefitIncomeTotal; - - /** - * 新零售收益小计 - */ - @BigDecimalFormat("#0.00") - private BigDecimal retailRealSubtotal; + @BigDecimalFormat + private BigDecimal globalPoints; /** * 实发收益总计 */ - @BigDecimalFormat("#0.00") - private BigDecimal realIncomeTotal; + @BigDecimalFormat + private BigDecimal realIncomeTotalOri; + + /** + * 新零售收益小计 + */ + @BigDecimalFormat + private BigDecimal retailRealSubtotal; }