From 3de0a3aef6d7284136cbe9cdc89b2e9dc05014d6 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 18:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/FranchiseReportResponse.java | 9 +++++++-- .../impl/ExportRealizeServiceImpl.java | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java index 337230335..3879a960b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java @@ -79,13 +79,18 @@ public class FranchiseReportResponse { @ColumnWidth(20) private BigDecimal loanMarginTotal = BigDecimal.ZERO; + @ApiModelProperty(value = "收款金额总计") + @ExcelProperty(value = "收款金额总计=加盟费+管理/品牌/设计费+保证金",order = 13) + @ColumnWidth(25) + private BigDecimal total = BigDecimal.ZERO; + @ApiModelProperty(value = "昨日日期") - @ExcelProperty(value = "昨日日期",order = 13) + @ExcelProperty(value = "昨日日期",order = 14) @ColumnWidth(15) private String yesterdayDate; @ApiModelProperty(value = "昨天门店数") - @ExcelProperty(value = "昨天门店数",order = 14) + @ExcelProperty(value = "昨天门店数",order = 15) @ColumnWidth(15) private Integer yesterdayStoreNum = 0; @ExcelIgnore diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java index 8c7326fea..dd1b43baf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java @@ -630,9 +630,29 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { } @Override + @Async public void exportZxjpOpenShopReport(List list, ImportTaskDO importTaskDO, FranchiseReportRequest request) { String url = ""; try { + FranchiseReportResponse total = new FranchiseReportResponse(); + total.setYesterdayDate(list.get(0).getYesterdayDate()); + total.setJoinGroupName("总计"); + for (FranchiseReportResponse response : list){ + response.setTotal(response.getFranchiseFeeTotal().add(response.getManagementBrandingDesignFeeTotal()).add(response.getLoanMarginTotal())); + total.setTotal(total.getTotal().add(response.getTotal())); + total.setStoreNum(total.getStoreNum() + response.getStoreNum()); + total.setNormalStoreNum(total.getNormalStoreNum() + response.getNormalStoreNum()); + total.setRestaurantStoreNum(total.getRestaurantStoreNum() + response.getRestaurantStoreNum()); + total.setNoShowStoreNum(total.getNoShowStoreNum() + response.getNoShowStoreNum()); + total.setFranchiseFeeTotal(total.getFranchiseFeeTotal().add(response.getFranchiseFeeTotal())); + total.setFirstYearBrandingFeeTotal(total.getFirstYearBrandingFeeTotal().add(response.getFirstYearBrandingFeeTotal())); + total.setFirstYearManagementFeeTotal(total.getFirstYearManagementFeeTotal().add(response.getFirstYearManagementFeeTotal())); + total.setPerformanceBondTotal(total.getPerformanceBondTotal().add(response.getPerformanceBondTotal())); + total.setManagementBrandingDesignFeeTotal(total.getManagementBrandingDesignFeeTotal().add(response.getManagementBrandingDesignFeeTotal())); + total.setLoanMarginTotal(total.getLoanMarginTotal().add(response.getLoanMarginTotal())); + total.setYesterdayStoreNum(total.getYesterdayStoreNum() + response.getYesterdayStoreNum()); + } + list.add(total); url = easyExcelUtil.exportExcelSpecial(FranchiseReportResponse.class, list, null, FileTypeEnum.ZXJP_OPEN_SHOP_REPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date()), FileTypeEnum.ZXJP_OPEN_SHOP_REPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date()),