diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index d7a10bcc..c1d89216 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -241,7 +241,6 @@ public class CuMemberBonusServiceImpl extends ServiceImpl cuMemberBonusCoachList = cuMemberBonusCoachMapper.queryMemberBonusCoachByBonusItemsForServer(bonusParam); dataTable = getDataTable(cuMemberBonusCoachList); cuMemberBonusCoachList.forEach(cuMemberBonusCoach -> { 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 e39a246a..34f197f2 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 @@ -69,6 +69,12 @@ public class BonusTotalVO implements Serializable { @Excel(name = "复购级差收益", scale = 2) private BigDecimal retailMonthRepurchaseIncome; + /** + * 培育津贴 + */ + @Excel(name = "培育津贴", scale = 2) + private BigDecimal coachIncome; + /** * 福利分红平均收益 */ @@ -233,10 +239,6 @@ public class BonusTotalVO implements Serializable { */ private BigDecimal expandCapping; - /** - * 辅导收益 - */ - private BigDecimal coachIncome; /** * 分红收益 diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java index 13af0ad5..e021d43a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java @@ -91,7 +91,7 @@ public class CuMemberBonusVO implements Serializable { */ public static final String[] INCOME_ARRAY = new String[]{ "backPoints", "retailRangeIncome", "retailSameLevelIncome", "retailAreaIncome", - "retailBenefitRangeIncome", "retailMonthRepurchaseIncome", "retailBenefitAvgIncome", + "retailBenefitRangeIncome", "retailMonthRepurchaseIncome", "coachIncome", "retailBenefitAvgIncome", "retailBenefitIncome", "retailRealSubtotal", "realIncomeTotal"}; @@ -130,6 +130,13 @@ public class CuMemberBonusVO implements Serializable { @Excel(name = "复购级差收益", scale = 2) private BigDecimal retailMonthRepurchaseIncomeOri; + /** + * 培育津贴 + */ + private BigDecimal coachIncome; + @Excel(name = "培育津贴", scale = 2) + private BigDecimal coachIncomeOri; + /** * 新零售福利平均收益 */ @@ -160,7 +167,7 @@ public class CuMemberBonusVO implements Serializable { */ private BigDecimal retailRealSubtotal; - @Excel(name = "收益小计", scale = 2) +// @Excel(name = "收益小计", scale = 2) private BigDecimal retailRealSubtotalOri; /** diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusCoachMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusCoachMapper.xml index 24bb89ef..2069a109 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusCoachMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusCoachMapper.xml @@ -153,20 +153,22 @@ order by b.period,b.pk_bonus_items,b.real_income desc +