接口调整

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
     <if test="request.pointStatusList != null and request.pointStatusList.size() > 0">
       and point_status in
-      <foreach collection="request.pointStatusList" item="pointStatus" open="(" close=")">
+      <foreach collection="request.pointStatusList" item="pointStatus" separator="," open="(" close=")">
         #{pointStatus}
       </foreach>
     </if>

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;
 

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

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