angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 见点收益前后台显示返回；

This commit is contained in:
cabbage 2025-07-24 15:06:13 +08:00
parent 357bfa1231
commit 87f133631a
4 changed files with 54 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
View File

@ -464,8 +464,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusDetail, MemberBonusDetailSerVO.class); MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusDetail, MemberBonusDetailSerVO.class);
memberBonusDetailSerVoS.add(memberBonusDetailVO); memberBonusDetailSerVoS.add(memberBonusDetailVO);
}); });
} else if (EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue || } else if (EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue
EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) { || EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) {
// 直推 推荐收益 // 直推 推荐收益
List<CuMemberBonusPushExt> cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItemsFoServer(bonusParam); List<CuMemberBonusPushExt> cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItemsFoServer(bonusParam);
dataTable = getDataTable(cuMemberBonusPushList); dataTable = getDataTable(cuMemberBonusPushList);
@ -483,8 +483,9 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
memberBonusDetailSerVoS.add(memberBonusDetailVO); memberBonusDetailSerVoS.add(memberBonusDetailVO);
}); });
} else if (EBonusItems.COACHING_INCOME.getValue() == bonusItemsValue } else if (EBonusItems.COACHING_INCOME.getValue() == bonusItemsValue
|| EBonusItems.REPURCHASE_COACHING_INCOME.getValue() == bonusItemsValue) { || EBonusItems.REPURCHASE_COACHING_INCOME.getValue() == bonusItemsValue
// 辅导收益、复购辅导收益 || EBonusItems.REPURCHASE_POINT_INCOME.getValue() == bonusItemsValue) {
// 辅导收益、复购辅导收益、见点收益
List<CuMemberBonusCoachExt> cuMemberBonusCoachList = cuMemberBonusCoachMapper.queryMemberBonusCoachByBonusItemsForServer(bonusParam); List<CuMemberBonusCoachExt> cuMemberBonusCoachList = cuMemberBonusCoachMapper.queryMemberBonusCoachByBonusItemsForServer(bonusParam);
dataTable = getDataTable(cuMemberBonusCoachList); dataTable = getDataTable(cuMemberBonusCoachList);
cuMemberBonusCoachList.forEach(cuMemberBonusCoach -> { cuMemberBonusCoachList.forEach(cuMemberBonusCoach -> {

15
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalExportVO.java
View File

@ -1,11 +1,13 @@
package com.hzs.bonus.bonus.vo; package com.hzs.bonus.bonus.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Excel;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
@Data @Data
@Builder @Builder
@ -17,6 +19,13 @@ public class BonusTotalExportVO implements Serializable {
@Excel(name = "结算期数") @Excel(name = "结算期数")
private Integer period; 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) @Excel(name = "复购辅导收益", scale = 2)
private BigDecimal repurCoachIncomeOri; private BigDecimal repurCoachIncomeOri;
/**
* 复购见点收益
*/
@Excel(name = "见点收益", scale = 2)
private BigDecimal globalPointsOri;
/** /**
* 商城重消 * 商城重消
*/ */

67
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java
View File

@ -26,6 +26,13 @@ public class BonusTotalVO implements Serializable {
@Excel(name = "结算期数") @Excel(name = "结算期数")
private Integer period; 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; private BigDecimal shareIncomeOri;
/** /**
* 报单收益 * 报单收益
*/ */
@Excel(name = "报单收益", scale = 2) @Excel(name = "服务补贴", scale = 2)
private BigDecimal serviceIncomeOri; private BigDecimal serviceIncomeOri;
@Excel(name = "复购推荐收益", scale = 2)
private BigDecimal repurPushIncomeOri; private BigDecimal repurPushIncomeOri;
/** /**
* 复购级差收益 * 复购级差收益
*/ */
@Excel(name = "复购级差收益", scale = 2)
private BigDecimal repurRangeIncomeOri; private BigDecimal repurRangeIncomeOri;
/** /**
@ -92,22 +96,32 @@ public class BonusTotalVO implements Serializable {
@Excel(name = "复购辅导收益", scale = 2) @Excel(name = "复购辅导收益", scale = 2)
private BigDecimal repurCoachIncomeOri; private BigDecimal repurCoachIncomeOri;
/**
* 复购见点收益
*/
@Excel(name = "见点收益", scale = 2)
private BigDecimal globalPointsOri;
/**
* 见点收益
*/
private BigDecimal globalPoints;
/** /**
* 复购券 * 复购券
*/ */
@Excel(name = "复购券", scale = 2)
private BigDecimal repurCouponOri; private BigDecimal repurCouponOri;
/** /**
* 复购券均分收益 * 复购券均分收益
*/ */
@Excel(name = "复购券均分", scale = 2)
private BigDecimal repurCouponShareOri; private BigDecimal repurCouponShareOri;
/** /**
* 商城重消 * 商城重消
*/ */
@Excel(name = "商城重消", scale = 2) @Excel(name = "重复消费", scale = 2)
private BigDecimal backPointsOri; private BigDecimal backPointsOri;
/** /**
@ -116,22 +130,14 @@ public class BonusTotalVO implements Serializable {
@Excel(name = "平台服务费", scale = 2) @Excel(name = "平台服务费", scale = 2)
private BigDecimal serviceSpendOri; private BigDecimal serviceSpendOri;
/**
* 环球积分
*/
@Excel(name = "直推极差", scale = 2)
private BigDecimal globalPointsOri;
/** /**
* 车奖积分 * 车奖积分
*/ */
@Excel(name = "车奖积分", scale = 2)
private BigDecimal carAwardPointsOri; private BigDecimal carAwardPointsOri;
/** /**
* 店铺收益 * 店铺收益
*/ */
@Excel(name = "店铺收益", scale = 2)
private BigDecimal storeIncomeOri; private BigDecimal storeIncomeOri;
/** /**
@ -149,7 +155,6 @@ public class BonusTotalVO implements Serializable {
/** /**
* 复购券小计 * 复购券小计
*/ */
@Excel(name = "复购券实发小计", scale = 2)
private BigDecimal repurCouponSubtotalOri; private BigDecimal repurCouponSubtotalOri;
/** /**
@ -161,13 +166,11 @@ public class BonusTotalVO implements Serializable {
/** /**
* 直推收益 * 直推收益
*/ */
@Excel(name = "直推收益($)", scale = 2)
private BigDecimal directIncome; private BigDecimal directIncome;
/** /**
* 拓展收益 * 拓展收益
*/ */
@Excel(name = "拓展收益($)", scale = 2)
private BigDecimal expandIncome; private BigDecimal expandIncome;
/** /**
@ -183,112 +186,84 @@ public class BonusTotalVO implements Serializable {
/** /**
* 辅导收益 * 辅导收益
*/ */
@Excel(name = "辅导收益($)", scale = 2)
private BigDecimal coachIncome; private BigDecimal coachIncome;
/** /**
* 分红收益 * 分红收益
*/ */
@Excel(name = "分红收益($)", scale = 2)
private BigDecimal shareIncome; private BigDecimal shareIncome;
/** /**
* 报单收益 * 报单收益
*/ */
@Excel(name = "报单收益($)", scale = 2)
private BigDecimal serviceIncome; private BigDecimal serviceIncome;
@Excel(name = "复购推荐($)", scale = 2)
private BigDecimal repurPushIncome; private BigDecimal repurPushIncome;
/** /**
* 复购级差收益 * 复购级差收益
*/ */
@Excel(name = "复购级差收益($)", scale = 2)
private BigDecimal repurRangeIncome; private BigDecimal repurRangeIncome;
/** /**
* 复购拓展收益 * 复购拓展收益
*/ */
@Excel(name = "复购拓展收益($)", scale = 2)
private BigDecimal repurExpandIncome; private BigDecimal repurExpandIncome;
/** /**
* 复购辅导收益 * 复购辅导收益
*/ */
@Excel(name = "复购辅导收益($)", scale = 2)
private BigDecimal repurCoachIncome; private BigDecimal repurCoachIncome;
/** /**
* 复购券 * 复购券
*/ */
@Excel(name = "复购券($)", scale = 2)
private BigDecimal repurCoupon; private BigDecimal repurCoupon;
/** /**
* 复购券均分收益 * 复购券均分收益
*/ */
@Excel(name = "复购券均分($)", scale = 2)
private BigDecimal repurCouponShare; private BigDecimal repurCouponShare;
/** /**
* 商城重消 * 商城重消
*/ */
@Excel(name = "商城重消($)", scale = 2)
private BigDecimal backPoints; private BigDecimal backPoints;
/** /**
* 平台服务费 * 平台服务费
*/ */
@Excel(name = "平台服务费($)", scale = 2)
private BigDecimal serviceSpend; private BigDecimal serviceSpend;
/**
* 环球积分
*/
@Excel(name = "直推极差($)", scale = 2)
private BigDecimal globalPoints;
/** /**
* 车奖积分 * 车奖积分
*/ */
@Excel(name = "车奖积分($)", scale = 2)
private BigDecimal carAwardPoints; private BigDecimal carAwardPoints;
/** /**
* 店铺收益 * 店铺收益
*/ */
@Excel(name = "店铺收益($)", scale = 2)
private BigDecimal storeIncome; private BigDecimal storeIncome;
/** /**
* 首购实发小计 * 首购实发小计
*/ */
@Excel(name = "首购实发小计($)", scale = 2)
private BigDecimal purRealSubtotal; private BigDecimal purRealSubtotal;
/** /**
* 复购实发小计 * 复购实发小计
*/ */
@Excel(name = "复购实发小计($)", scale = 2)
private BigDecimal repurRealSubtotal; private BigDecimal repurRealSubtotal;
/** /**
* 复购券小计 * 复购券小计
*/ */
@Excel(name = "复购券实发小计($)", scale = 2)
private BigDecimal repurCouponSubtotal; private BigDecimal repurCouponSubtotal;
/** /**
* 实发收益总计 * 实发收益总计
*/ */
@Excel(name = "实发收益总计($)", scale = 2)
private BigDecimal realIncomeTotal; private BigDecimal realIncomeTotal;
/**
* 结算日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结算时间", dateFormat = "yyyy-MM-dd")
private Date settleDate;
} }

33
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java
View File

@ -154,7 +154,6 @@ public class CuMemberBonusVO implements Serializable {
/** /**
* 分红收益 * 分红收益
*/ */
@Excel(name = "分红收益", scale = 2)
private BigDecimal shareIncomeOri; private BigDecimal shareIncomeOri;
/** /**
@ -163,9 +162,9 @@ public class CuMemberBonusVO implements Serializable {
private BigDecimal shareIncome; private BigDecimal shareIncome;
/** /**
* 报单收益 * 服务补贴
*/ */
@Excel(name = "报单收益", scale = 2) @Excel(name = "服务补贴", scale = 2)
private BigDecimal serviceIncomeOri; private BigDecimal serviceIncomeOri;
/** /**
@ -186,7 +185,6 @@ public class CuMemberBonusVO implements Serializable {
/** /**
* 复购级差收益 * 复购级差收益
*/ */
@Excel(name = "复购级差收益", scale = 2)
private BigDecimal repurRangeIncomeOri; private BigDecimal repurRangeIncomeOri;
/** /**
@ -194,7 +192,6 @@ public class CuMemberBonusVO implements Serializable {
*/ */
private BigDecimal repurRangeIncome; private BigDecimal repurRangeIncome;
/** /**
* 复购拓展收益 * 复购拓展收益
*/ */
@ -216,10 +213,19 @@ public class CuMemberBonusVO implements Serializable {
*/ */
private BigDecimal repurCoachIncome; private BigDecimal repurCoachIncome;
/**
* 复购见点收益
*/
@Excel(name = "见点收益", scale = 2)
private BigDecimal globalPoints;
/**
* 见点收益
*/
private BigDecimal globalPointsOri;
/** /**
* 复购卷 * 复购卷
*/ */
@Excel(name = "复购卷", scale = 2)
private BigDecimal repurCouponOri; private BigDecimal repurCouponOri;
/** /**
@ -230,7 +236,6 @@ public class CuMemberBonusVO implements Serializable {
/** /**
* 复购券均分收益 * 复购券均分收益
*/ */
@Excel(name = "复购券均分", scale = 2)
private BigDecimal repurCouponShareOri; private BigDecimal repurCouponShareOri;
/** /**
@ -241,7 +246,7 @@ public class CuMemberBonusVO implements Serializable {
/** /**
* 商城重消 * 商城重消
*/ */
@Excel(name = "商城重消", scale = 2) @Excel(name = "重复消费", scale = 2)
private BigDecimal backPointsOri; private BigDecimal backPointsOri;
/** /**
@ -260,21 +265,10 @@ public class CuMemberBonusVO implements Serializable {
*/ */
private BigDecimal serviceSpend; private BigDecimal serviceSpend;
/**
* 环球积分
*/
@Excel(name = "直推极差", scale = 2)
private BigDecimal globalPointsOri;
/**
* 环球积分
*/
private BigDecimal globalPoints;
/** /**
* 车奖积分 * 车奖积分
*/ */
@Excel(name = "车奖积分", scale = 2)
private BigDecimal carAwardPointsOri; private BigDecimal carAwardPointsOri;
@ -318,7 +312,6 @@ public class CuMemberBonusVO implements Serializable {
/** /**
* 复购券小计 * 复购券小计
*/ */
@Excel(name = "复购券实发小计", scale = 2)
private BigDecimal repurCouponSubtotalOri; private BigDecimal repurCouponSubtotalOri;
/** /**