diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index fa9635621..c54ae5efa 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -34,6 +34,8 @@ public class CommonConstants { public static final int FIVE_SECONDS = 5000; public static final int MAX_EXPORT_SIZE = 10000; + + public static final int INT_MAX_VALUE = 2147483647; /** * 跟进任务通知缓存时间 1小时 */ diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java index e7542a5c1..b45432fb4 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java @@ -25,6 +25,7 @@ public enum FileTypeEnum { IMPORT_OA_OLD_SHOP_STAGE_DATA_ERROR("OaOldShopStageDataError", "导入OA旧数据阶段错误列表"), IMPORT_FITMENT_SHOP_STAGE("importFitmentShopStage", "导入装修阶段完成数据"), IMPORT_FITMENT_SHOP_STAGE_DATA_ERROR_LIST("OaOldShopStageDataErrorList", "导入装修阶段完成数据错误列表 "), + SELLING_DETAILS_REPORT("sellingDetailsReport", "开店明细报表"), ; private String fileType; private String desc; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/ShopReportResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/ShopReportResponse.java index 29c11245b..032c19ad4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/ShopReportResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/ShopReportResponse.java @@ -100,7 +100,6 @@ public class ShopReportResponse { @ColumnWidth(25) private BigDecimal total = BigDecimal.ZERO; - //集团维度使用 @ExcelIgnore private Long regionId; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java index bb839e02c..e16c5dfb6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java @@ -7,6 +7,7 @@ import com.cool.store.entity.PointInfoDO; import com.cool.store.request.FranchiseReportRequest; import com.cool.store.response.BranchShopResponse; import com.cool.store.response.FranchiseReportResponse; +import com.cool.store.response.ShopReportResponse; import java.util.List; @@ -28,4 +29,6 @@ public interface ExportRealizeService { void exportProgress(List list,ImportTaskDO importTaskDO); void exportZxjpOpenShopReport(List list, ImportTaskDO importTaskDO, FranchiseReportRequest request); + + void exportZxjpOpenShopReportPage(List list, ImportTaskDO importTaskDO, FranchiseReportRequest request); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java index edb60899f..feb260ab2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.enums.FileTypeEnum; import com.cool.store.request.*; @@ -18,8 +19,10 @@ public interface ExportService { //财务导出 //加盟开店申请 //进度确认 Long exportProgressBase(BranchShopRequest request, LoginUserInfo user, FileTypeEnum fileTypeEnum); - //正新加盟报表导出 + //正新鸡排加盟报表导出 Long exportZxjpOpenShopReport(FranchiseReportRequest request, LoginUserInfo user); + //正新鸡排门店维度加盟导出 + Long exportZxjpOpenShopReportPage(FranchiseReportRequest request, LoginUserInfo user); } 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 dd1b43baf..110474990 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 @@ -18,6 +18,7 @@ import com.cool.store.request.FranchiseReportRequest; import com.cool.store.request.InitiatingRequest; import com.cool.store.response.BranchShopResponse; import com.cool.store.response.FranchiseReportResponse; +import com.cool.store.response.ShopReportResponse; import com.cool.store.service.*; import com.cool.store.utils.JSONUtils; import com.cool.store.utils.RedisUtilPool; @@ -667,6 +668,25 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { } } + @Override + @Async + public void exportZxjpOpenShopReportPage(List list, ImportTaskDO importTaskDO, FranchiseReportRequest request) { + String url = ""; + try { + url = easyExcelUtil.exportExcelSpecial(ShopReportResponse.class, list, null, + FileTypeEnum.SELLING_DETAILS_REPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date()), + FileTypeEnum.SELLING_DETAILS_REPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date()), + "建店资料完成日期:",request.getBuildStartTime(),request.getBuildEndTime()); + } catch (Throwable e) { + log.error("fileUpload upload err, originFileName={}", FileTypeEnum.SELLING_DETAILS_REPORT.getDesc(), e); + throw new ServiceException(ErrorCodeEnum.INTERNAL_SERVER_ERROR); + } finally { + importTaskDO.setStatus(ImportStatusEnum.success.getCode()); + importTaskDO.setFileUrl(url); + importTaskMapper.update(eid, importTaskDO); + } + } + private String toString(Object o) { if (o == null) { return ""; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java index 3fedd6995..cab7e055f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java @@ -20,6 +20,7 @@ import com.cool.store.mapper.PointInfoMapper; import com.cool.store.request.*; import com.cool.store.response.BranchShopResponse; import com.cool.store.response.FranchiseReportResponse; +import com.cool.store.response.ShopReportResponse; import com.cool.store.service.*; import com.cool.store.utils.easyExcel.EasyExcelUtil; import com.cool.store.utils.poi.DateUtils; @@ -161,5 +162,28 @@ public class ExportServiceImpl implements ExportService { return (long) franchiseReport.size(); } + @Override + public Long exportZxjpOpenShopReportPage(FranchiseReportRequest request, LoginUserInfo user) { + request.setPageSize(CommonConstants.INT_MAX_VALUE); + request.setPageNum(CommonConstants.ONE); + PageInfo pageInfo = franchiseReportService.zxjpOpenShopReportPage(request); + List list = pageInfo.getList(); + if (CollectionUtils.isEmpty(list)){ + log.error("导出数据为空"); + return 0L; + } + ImportTaskDO importTaskDO = new ImportTaskDO(); + importTaskDO.setStatus(ImportStatusEnum.Ongoing.getCode()); + importTaskDO.setFileName(FileTypeEnum.SELLING_DETAILS_REPORT.getDesc() + DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START_1, new Date())); + importTaskDO.setIsImport(Boolean.FALSE); + importTaskDO.setFileType(FileTypeEnum.SELLING_DETAILS_REPORT.getFileType()); + importTaskDO.setCreateUserId(user.getUserId()); + importTaskDO.setCreateTime(new Date().getTime()); + importTaskDO.setCreateName(user.getName()); + importTaskMapper.insert(eid, importTaskDO); + exportRealizeService.exportZxjpOpenShopReportPage(list, importTaskDO,request); + return (long) list.size(); + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java index a2cfd6982..00462931a 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java @@ -62,4 +62,10 @@ public class ExportController { public ResponseResult zxjpOpenShopReport(@RequestBody FranchiseReportRequest request) { return ResponseResult.success(exportService.exportZxjpOpenShopReport(request, CurrentUserHolder.getUser())); } + + @PostMapping("/zxjpOpenShopReportPage") + @ApiOperation("正新鸡排开店") + public ResponseResult zxjpOpenShopReportPage(@RequestBody FranchiseReportRequest request) { + return ResponseResult.success(exportService.exportZxjpOpenShopReportPage(request, CurrentUserHolder.getUser())); + } }