diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml index fea8f078c..689089e27 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml @@ -122,7 +122,7 @@ where deleted = 0 and point_status in (4,5) and development_manager = #{request.developmentManager} and select_status = 0 and point_status in - + #{pointStatus} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RejectPointRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RejectPointRequest.java index d05418d39..9a51a0b13 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/RejectPointRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/RejectPointRequest.java @@ -20,7 +20,6 @@ public class RejectPointRequest { @ApiModelProperty("铺位id") private Long pointId; - @NotBlank @ApiModelProperty("拒绝原因") private String reason; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java index 5bd620ca8..d70ca1b5e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java @@ -47,6 +47,12 @@ public class PointDetailVO { @ApiModelProperty("选择状态0.未选择, 1.已被选择") private Integer selectStatus; + @ApiModelProperty("扩展经理名称") + private String developmentManagerUserName; + + @ApiModelProperty("拓展时间") + private Date developmentTime; + @ApiModelProperty("铺位得分") private Integer pointScore; @@ -256,6 +262,7 @@ public class PointDetailVO { if(PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())){ result.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode()); } + result.setDevelopmentTime(pointInfo.getDevelopmentTime()); result.setPointArea(pointInfo.getPointArea()); result.setRegionId(pointInfo.getRegionId()); result.setPointSource(pointInfo.getPointSource()); 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 8e82a1909..0d852be13 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 @@ -109,7 +109,9 @@ public class PointServiceImpl implements PointService { log.error("铺位详情信息不存在"); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); } + String userName = enterpriseUserDAO.getUserName(pointInfo.getDevelopmentManager()); PointDetailVO result = PointDetailVO.convertVO(pointInfo, pointDetailInfo); + result.setDevelopmentManagerUserName(userName); result.setRegionNodeName(regionService.getBelongWarRegionName(pointInfo.getRegionId())); if(Objects.nonNull(isGetNodeNo) && isGetNodeNo){ result.setCurNodeNo(pointTodoInfoDAO.getCurNodeNoByPoint(pointId));