From e15dbdd99f2cff9f8789466ba2dea1304ea5d2bd Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 13 Jan 2025 16:38:41 +0800 Subject: [PATCH] fix --- .../com/cool/store/vo/shop/MiniShopPageVO.java | 4 +++- .../cool/store/service/PreparationService.java | 2 +- .../service/impl/ExportRealizeServiceImpl.java | 2 +- .../store/controller/webb/ExportController.java | 17 ++++++++--------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java index f49234a1d..7cd2706b8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java @@ -60,7 +60,8 @@ public class MiniShopPageVO { private String joinMode; @ApiModelProperty("意向开店区域") private String wantRegionName; - + @ApiModelProperty("门店状态'0.跟进中 1.已完成 2.已放弃',") + private Integer shopStatus; public MiniShopPageVO(Long shopId, String shopName, String shopCode, Boolean flag, Long pointId, Long regionId, String regionName) { this.shopId = shopId; this.shopName = shopName; @@ -99,6 +100,7 @@ public class MiniShopPageVO { if (Objects.nonNull(wantRegionMap)) { miniShopPageVO.setWantRegionName(wantRegionMap.get(shopInfo.getWantShopAreaId())); } + miniShopPageVO.setShopStatus(shopInfo.getShopStatus()); resultList.add(miniShopPageVO); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java index cfb2de692..44dececaf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java @@ -20,7 +20,7 @@ public interface PreparationService { /** * 开业进度列表 * @param preparationRequest - * @return + * @return //原先进度管理接口废弃，使用branchShopList */ PageInfo getPreparationSchedule(PreparationRequest preparationRequest); 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 a99f75990..b8e0cf699 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 @@ -207,7 +207,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { dto.setCurrentProgress(response.getCompletionColumn()+"/"+response.getTotalColumn()); dto.setShopStatus(response.getShopStatus()); dto.setPlanOpenTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1,response.getPlanOpenTime())); - dto.setOpenDuration(response.getOpenTime()); + dto.setOpenDuration(response.getDays()); exportList.add(dto); } url = easyExcelUtil.exportExcel(ExportBranchShopDTO.class, exportList, null, FileTypeEnum.BRANCH_SHOP_LIST.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date()), FileTypeEnum.BRANCH_SHOP_LIST.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date())); 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 4b128cd56..4d584c251 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 @@ -28,17 +28,16 @@ public class ExportController { private ExportService exportService; +// @PostMapping("/preparationList") +// @ApiOperation("进度管理") +// public ResponseResult preparationList(@RequestBody BranchShopRequest request) { +// return ResponseResult.success(exportService.branchShopList(request, CurrentUserHolder.getUser())); +// } + + @PostMapping("/preparationList") @ApiOperation("进度管理") - public ResponseResult preparationList(@RequestBody PreparationRequest request) { - request.setCurUserId(CurrentUserHolder.getUserId()); - return ResponseResult.success(exportService.preparationList(request, CurrentUserHolder.getUser())); - } - - - @PostMapping("/branchShopList") - @ApiOperation("进度管理") - public ResponseResult branchShopList(@RequestBody BranchShopRequest request) { + public ResponseResult preparationList(@RequestBody BranchShopRequest request) { return ResponseResult.success(exportService.branchShopList(request, CurrentUserHolder.getUser())); } }