diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java index 1d09a90ba..a2b843593 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java @@ -85,7 +85,7 @@ public class AddPointDetailRequest { private String landlordUsername; @ApiModelProperty("房东电话") - @NotBlank(message = "房东电话不能为空") + // @NotBlank(message = "房东电话不能为空") private String landlordMobile; @Min(1) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 351040212..34362e259 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -414,9 +414,9 @@ public class DeskServiceImpl implements DeskService { if (CollectionUtils.isEmpty(list)) { return pageInfo; } - List shopIds = list.stream().filter(o-> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); + List shopIds = list.stream().filter(o -> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); - List shopIds1 = list.stream().filter(o-> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); + List shopIds1 = list.stream().filter(o -> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); List subStageList = shopStageInfoDAO.getSubStages(shopIds1, ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); doThing(deskStageMap, subStageList); @@ -428,10 +428,11 @@ public class DeskServiceImpl implements DeskService { } for (PreparationCommonPendingVO vo : list) { if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus()) && deskStageMap.get(vo.getShopId()) != null) { - if (deskStageMap.get(vo.getShopId()) != null){ - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());} + if (deskStageMap.get(vo.getShopId()) != null) { + vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + } } else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) { - vo.setSubmitTime(CoolDateUtils.DateFormat(constructionMap.get(vo.getShopId()),SPECIAL_DATE_START)); + vo.setSubmitTime(CoolDateUtils.DateFormat(constructionMap.get(vo.getShopId()), SPECIAL_DATE_START)); } } @@ -497,16 +498,23 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); - List subStageStatusList = new ArrayList<>(); - if (userRoleIds.contains(UserRoleEnum.LOGISTICS.getCode())){ + List subStageStatusList = new ArrayList<>(); + if (userRoleIds.contains(UserRoleEnum.LOGISTICS.getCode())) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus())); } - if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())){ - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())); - + if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())) { + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus()); + } + if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) || userRoleIds.contains(UserRoleEnum.REGIONAL_MANAGER.getCode())) { + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus()); } - return null; + if (userRoleIds.contains(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE.getCode()) ) { + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); + } + if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode()) ) { + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); + } + return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, true); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 632e35444..99aa6eab9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -121,7 +121,16 @@ public class PointServiceImpl implements PointService { request1.setCode(shopPointDetailRequest.getOpportunityPointCode()); request1.setUserId(userId); request1.setMobile(user.getMobile()); - request1.setUserName(user.getName()); + if (StringUtils.isBlank(user.getName())) { + if (StringUtils.isNotBlank(user.getMobile()) && user.getMobile().length() >= 4) { + // 获取后4位 + request1.setUserName("游客" + user.getMobile().substring(user.getMobile().length() - 4)); + } else { + request1.setUserName("游客"); + } + } else { + request1.setUserName(user.getName()); + } request1.setBerthId(Math.toIntExact(pointId)); request1.setName(pointInfo.getPointName()); request1.setAddress(pointInfo.getAddress()); @@ -964,7 +973,16 @@ public class PointServiceImpl implements PointService { request1.setCode(request.getOpportunityPointCode()); request1.setUserId(lineInfo.getPartnerId()); request1.setMobile(lineInfo.getMobile()); - request1.setUserName(lineInfo.getUsername()); + if (StringUtils.isBlank(lineInfo.getUsername())) { + if (StringUtils.isNotBlank(lineInfo.getMobile()) && lineInfo.getMobile().length() >= 4) { + // 获取后4位 + request1.setUserName("游客" + lineInfo.getMobile().substring(lineInfo.getMobile().length() - 4)); + } else { + request1.setUserName("游客"); + } + } else { + request1.setUserName(lineInfo.getUsername()); + } request1.setBerthId(Math.toIntExact(pointId)); request1.setName(pointInfo.getPointName()); request1.setAddress(pointInfo.getAddress());