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 e6e6b5de..f40615a1 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 @@ -464,8 +464,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItemsFoServer(bonusParam); dataTable = getDataTable(cuMemberBonusPushList); @@ -483,8 +483,9 @@ 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/BonusTotalExportVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalExportVO.java index 9e906531..c8a540c4 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalExportVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalExportVO.java @@ -1,11 +1,13 @@ package com.hzs.bonus.bonus.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.hzs.common.core.annotation.Excel; import lombok.Builder; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; @Data @Builder @@ -17,6 +19,13 @@ public class BonusTotalExportVO implements Serializable { @Excel(name = "结算期数") private Integer period; + /** + * 结算日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结算日期", dateFormat = "yyyy-MM-dd") + private Date settleDate; + /** * 直推收益 */ @@ -53,6 +62,12 @@ public class BonusTotalExportVO implements Serializable { @Excel(name = "复购辅导收益", scale = 2) private BigDecimal repurCoachIncomeOri; + /** + * 复购见点收益 + */ + @Excel(name = "见点收益", scale = 2) + private BigDecimal globalPointsOri; + /** * 商城重消 */ 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 b28e0d17..f7ab293c 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 @@ -26,6 +26,13 @@ public class BonusTotalVO implements Serializable { @Excel(name = "结算期数") private Integer period; + /** + * 结算日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结算日期", dateFormat = "yyyy-MM-dd") + private Date settleDate; + /** * 国家 */ @@ -62,22 +69,19 @@ public class BonusTotalVO implements Serializable { /** * 分红收益 */ - @Excel(name = "分红收益", scale = 2) private BigDecimal shareIncomeOri; /** * 报单收益 */ - @Excel(name = "报单收益", scale = 2) + @Excel(name = "服务补贴", scale = 2) private BigDecimal serviceIncomeOri; - @Excel(name = "复购推荐收益", scale = 2) private BigDecimal repurPushIncomeOri; /** * 复购级差收益 */ - @Excel(name = "复购级差收益", scale = 2) private BigDecimal repurRangeIncomeOri; /** @@ -92,22 +96,32 @@ public class BonusTotalVO implements Serializable { @Excel(name = "复购辅导收益", scale = 2) private BigDecimal repurCoachIncomeOri; + /** + * 复购见点收益 + */ + @Excel(name = "见点收益", scale = 2) + private BigDecimal globalPointsOri; + + /** + * 见点收益 + */ + private BigDecimal globalPoints; + + /** * 复购券 */ - @Excel(name = "复购券", scale = 2) private BigDecimal repurCouponOri; /** * 复购券均分收益 */ - @Excel(name = "复购券均分", scale = 2) private BigDecimal repurCouponShareOri; /** * 商城重消 */ - @Excel(name = "商城重消", scale = 2) + @Excel(name = "重复消费", scale = 2) private BigDecimal backPointsOri; /** @@ -116,22 +130,14 @@ public class BonusTotalVO implements Serializable { @Excel(name = "平台服务费", scale = 2) private BigDecimal serviceSpendOri; - /** - * 环球积分 - */ - @Excel(name = "直推极差", scale = 2) - private BigDecimal globalPointsOri; - /** * 车奖积分 */ - @Excel(name = "车奖积分", scale = 2) private BigDecimal carAwardPointsOri; /** * 店铺收益 */ - @Excel(name = "店铺收益", scale = 2) private BigDecimal storeIncomeOri; /** @@ -149,7 +155,6 @@ public class BonusTotalVO implements Serializable { /** * 复购券小计 */ - @Excel(name = "复购券实发小计", scale = 2) private BigDecimal repurCouponSubtotalOri; /** @@ -161,13 +166,11 @@ public class BonusTotalVO implements Serializable { /** * 直推收益 */ - @Excel(name = "直推收益($)", scale = 2) private BigDecimal directIncome; /** * 拓展收益 */ - @Excel(name = "拓展收益($)", scale = 2) private BigDecimal expandIncome; /** @@ -183,112 +186,84 @@ public class BonusTotalVO implements Serializable { /** * 辅导收益 */ - @Excel(name = "辅导收益($)", scale = 2) private BigDecimal coachIncome; /** * 分红收益 */ - @Excel(name = "分红收益($)", scale = 2) private BigDecimal shareIncome; /** * 报单收益 */ - @Excel(name = "报单收益($)", scale = 2) private BigDecimal serviceIncome; - @Excel(name = "复购推荐($)", scale = 2) private BigDecimal repurPushIncome; /** * 复购级差收益 */ - @Excel(name = "复购级差收益($)", scale = 2) private BigDecimal repurRangeIncome; /** * 复购拓展收益 */ - @Excel(name = "复购拓展收益($)", scale = 2) private BigDecimal repurExpandIncome; /** * 复购辅导收益 */ - @Excel(name = "复购辅导收益($)", scale = 2) private BigDecimal repurCoachIncome; /** * 复购券 */ - @Excel(name = "复购券($)", scale = 2) private BigDecimal repurCoupon; /** * 复购券均分收益 */ - @Excel(name = "复购券均分($)", scale = 2) private BigDecimal repurCouponShare; /** * 商城重消 */ - @Excel(name = "商城重消($)", scale = 2) private BigDecimal backPoints; /** * 平台服务费 */ - @Excel(name = "平台服务费($)", scale = 2) private BigDecimal serviceSpend; - /** - * 环球积分 - */ - @Excel(name = "直推极差($)", scale = 2) - private BigDecimal globalPoints; /** * 车奖积分 */ - @Excel(name = "车奖积分($)", scale = 2) private BigDecimal carAwardPoints; /** * 店铺收益 */ - @Excel(name = "店铺收益($)", scale = 2) private BigDecimal storeIncome; /** * 首购实发小计 */ - @Excel(name = "首购实发小计($)", scale = 2) private BigDecimal purRealSubtotal; /** * 复购实发小计 */ - @Excel(name = "复购实发小计($)", scale = 2) private BigDecimal repurRealSubtotal; /** * 复购券小计 */ - @Excel(name = "复购券实发小计($)", scale = 2) private BigDecimal repurCouponSubtotal; /** * 实发收益总计 */ - @Excel(name = "实发收益总计($)", scale = 2) private BigDecimal realIncomeTotal; - /** - * 结算日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结算时间", dateFormat = "yyyy-MM-dd") - private Date settleDate; } 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 c0d6a2cc..631a88d9 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 @@ -154,7 +154,6 @@ public class CuMemberBonusVO implements Serializable { /** * 分红收益 */ - @Excel(name = "分红收益", scale = 2) private BigDecimal shareIncomeOri; /** @@ -163,9 +162,9 @@ public class CuMemberBonusVO implements Serializable { private BigDecimal shareIncome; /** - * 报单收益 + * 服务补贴 */ - @Excel(name = "报单收益", scale = 2) + @Excel(name = "服务补贴", scale = 2) private BigDecimal serviceIncomeOri; /** @@ -186,7 +185,6 @@ public class CuMemberBonusVO implements Serializable { /** * 复购级差收益 */ - @Excel(name = "复购级差收益", scale = 2) private BigDecimal repurRangeIncomeOri; /** @@ -194,7 +192,6 @@ public class CuMemberBonusVO implements Serializable { */ private BigDecimal repurRangeIncome; - /** * 复购拓展收益 */ @@ -216,10 +213,19 @@ public class CuMemberBonusVO implements Serializable { */ private BigDecimal repurCoachIncome; + /** + * 复购见点收益 + */ + @Excel(name = "见点收益", scale = 2) + private BigDecimal globalPoints; + /** + * 见点收益 + */ + private BigDecimal globalPointsOri; + /** * 复购卷 */ - @Excel(name = "复购卷", scale = 2) private BigDecimal repurCouponOri; /** @@ -230,7 +236,6 @@ public class CuMemberBonusVO implements Serializable { /** * 复购券均分收益 */ - @Excel(name = "复购券均分", scale = 2) private BigDecimal repurCouponShareOri; /** @@ -241,7 +246,7 @@ public class CuMemberBonusVO implements Serializable { /** * 商城重消 */ - @Excel(name = "商城重消", scale = 2) + @Excel(name = "重复消费", scale = 2) private BigDecimal backPointsOri; /** @@ -260,21 +265,10 @@ public class CuMemberBonusVO implements Serializable { */ private BigDecimal serviceSpend; - /** - * 环球积分 - */ - @Excel(name = "直推极差", scale = 2) - private BigDecimal globalPointsOri; - - /** - * 环球积分 - */ - private BigDecimal globalPoints; /** * 车奖积分 */ - @Excel(name = "车奖积分", scale = 2) private BigDecimal carAwardPointsOri; @@ -318,7 +312,6 @@ public class CuMemberBonusVO implements Serializable { /** * 复购券小计 */ - @Excel(name = "复购券实发小计", scale = 2) private BigDecimal repurCouponSubtotalOri; /**