suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4

Browse Source
This commit is contained in:
苏竹红
2025-01-14 11:32:07 +08:00
parent fc622ef0ab e15dbdd99f
commit de2b7e39cf
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java
View File

@@ -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);
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java
View File

@@ -20,7 +20,7 @@ public interface PreparationService {
/**
* 开业进度列表
* @param preparationRequest
* @return
* @return //原先进度管理接口废弃，使用branchShopList
*/
PageInfo<PreparationScheduleVO> getPreparationSchedule(PreparationRequest preparationRequest);

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
View File

@@ -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()));

17
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
View File

@@ -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()));
}
}