From d50cbd5f973f839727fabb7023c2bd2bf99a8542 Mon Sep 17 00:00:00 2001 From: woody Date: Tue, 17 Jun 2025 16:15:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(CuMemberBonusController):=20=E5=A5=96?= =?UTF-8?q?=E9=87=91=E6=B1=87=E6=80=BB=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CuMemberBonusController.java | 12 ++- .../bonus/bonus/vo/BonusTotalExportVO.java | 85 +++++++++++++++++++ 2 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalExportVO.java diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java index 6f186c46..0c5eb3e9 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.hzs.bonus.bonus.param.BonusParam; import com.hzs.bonus.bonus.service.ICuMemberBonusService; +import com.hzs.bonus.bonus.vo.BonusTotalExportVO; import com.hzs.bonus.bonus.vo.BonusTotalVO; import com.hzs.bonus.bonus.vo.CuMemberBonusVO; import com.hzs.bonus.bonus.vo.MemberBonusDetailSerVO; @@ -96,11 +97,14 @@ public class CuMemberBonusController extends BaseController { bonusParam.setPkVertexList(pkVertex); bonusParam.setPkCountry(SecurityUtils.getPkCountry()); packageBonusParam(bonusParam); - List cuMemberBonusList = iCuMemberBonusService.queryBonusTotalVoByConditionForServer(bonusParam); + List cuMemberBonusList = iCuMemberBonusService + .queryBonusTotalVoByConditionForServer(bonusParam); List bonusTotalVoList = getBonusTotalVoS(cuMemberBonusList); - Map sourceBonusList = menuColumnServiceApi.queryMenuColumn("totalBonus", SecurityUtils.getUserId()).getData(); - ExcelUtil util = new ExcelUtil<>(BonusTotalVO.class, sourceBonusList); - util.exportExcel(response, bonusTotalVoList, "奖金汇总导出"); + List bonusTotalExportVOList = BeanUtil.copyToList(bonusTotalVoList, BonusTotalExportVO.class); + Map sourceBonusList = menuColumnServiceApi + .queryMenuColumn("totalBonus", SecurityUtils.getUserId()).getData(); + ExcelUtil util = new ExcelUtil<>(BonusTotalExportVO.class, sourceBonusList); + util.exportExcel(response, bonusTotalExportVOList, "奖金汇总导出"); } private List getBonusTotalVoS(List cuMemberBonusList) { 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 new file mode 100644 index 00000000..9e906531 --- /dev/null +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalExportVO.java @@ -0,0 +1,85 @@ +package com.hzs.bonus.bonus.vo; + +import com.hzs.common.core.annotation.Excel; +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@Builder +public class BonusTotalExportVO implements Serializable { + + /** + * 期间 + */ + @Excel(name = "结算期数") + private Integer period; + + /** + * 直推收益 + */ + @Excel(name = "直推收益", scale = 2) + private BigDecimal directIncomeOri; + + /** + * 拓展收益 + */ + @Excel(name = "拓展收益", scale = 2) + private BigDecimal expandIncomeOri; + + /** + * 辅导收益 + */ + @Excel(name = "辅导收益", scale = 2) + private BigDecimal coachIncomeOri; + + /** + * 服务补贴 + */ + @Excel(name = "服务补贴", scale = 2) + private BigDecimal serviceIncomeOri; + + /** + * 复购拓展收益 + */ + @Excel(name = "复购拓展收益", scale = 2) + private BigDecimal repurExpandIncomeOri; + + /** + * 复购辅导收益 + */ + @Excel(name = "复购辅导收益", scale = 2) + private BigDecimal repurCoachIncomeOri; + + /** + * 商城重消 + */ + @Excel(name = "重复消费", scale = 2) + private BigDecimal backPointsOri; + + /** + * 平台服务费 + */ + @Excel(name = "平台服务费", scale = 2) + private BigDecimal serviceSpendOri; + + /** + * 首购实发小计 + */ + @Excel(name = "首购实发小计", scale = 2) + private BigDecimal purRealSubtotalOri; + + /** + * 复购实发小计 + */ + @Excel(name = "复购实发小计", scale = 2) + private BigDecimal repurRealSubtotalOri; + + /** + * 实发收益总计 + */ + @Excel(name = "实发收益总计", scale = 2) + private BigDecimal realIncomeTotalOri; +}