feat(CuMemberBonusController): 奖金汇总导出字段调整

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<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService.queryBonusTotalVoByConditionForServer(bonusParam);
+        List<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService
+                .queryBonusTotalVoByConditionForServer(bonusParam);
         List<BonusTotalVO> bonusTotalVoList = getBonusTotalVoS(cuMemberBonusList);
-        Map<String, Integer> sourceBonusList = menuColumnServiceApi.queryMenuColumn("totalBonus", SecurityUtils.getUserId()).getData();
+        List<BonusTotalExportVO> bonusTotalExportVOList = BeanUtil.copyToList(bonusTotalVoList, BonusTotalExportVO.class);
-        ExcelUtil<BonusTotalVO> util = new ExcelUtil<>(BonusTotalVO.class, sourceBonusList);
+        Map<String, Integer> sourceBonusList = menuColumnServiceApi
-        util.exportExcel(response, bonusTotalVoList, "奖金汇总导出");
+                .queryMenuColumn("totalBonus", SecurityUtils.getUserId()).getData();
+        ExcelUtil<BonusTotalExportVO> util = new ExcelUtil<>(BonusTotalExportVO.class, sourceBonusList);
+        util.exportExcel(response, bonusTotalExportVOList, "奖金汇总导出");
     }
 
     private List<BonusTotalVO> getBonusTotalVoS(List<CuMemberBonusExt> cuMemberBonusList) {

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;
+}