详情调整

coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java

@@ -51,4 +51,11 @@ public class PointTodoInfoDAO {
         PageHelper.startPage(request.getPageNum(), request.getPageSize());
         return pointTodoInfoMapper.getUserTodoList(request);
     }
+
+    public Integer getCurNodeNoByPoint(Long pointId){
+        if(Objects.isNull(pointId)){
+            return null;
+        }
+        return pointTodoInfoMapper.getCurNodeNoByPoint(pointId);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java

@@ -56,4 +56,11 @@ public interface PointTodoInfoMapper extends Mapper<PointTodoInfoDO> {
      * @return
      */
     Page<PointInfoDO> getUserTodoList(@Param("request") PointTodoPageRequest request);
+
+    /**
+     * 获取当前节点
+     * @param pointId
+     * @return
+     */
+    Integer getCurNodeNoByPoint(@Param("pointId") Long pointId);
 }

coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml

@@ -95,4 +95,9 @@
     where
       a.handler_user_id = #{request.developmentManager} and a.status = 0 and a.deleted = 0 and b.deleted = 0
   </select>
+
+  <select id="getCurNodeNoByPoint" resultType="integer">
+    select node_no from xfsg_point_todo_info where point_id = #{pointId} and status = 0 and deleted = 0 limit 1
+  </select>
+
 </mapper>

coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java

@@ -26,7 +26,7 @@ public class AddPointDetailRequest {
     @ApiModelProperty("详细地址")
     private String address;
 
-    @ApiModelProperty("经营状况")
+    @ApiModelProperty("经营状况 1营业中 2空铺")
     private Integer businessStatus;
 
     @ApiModelProperty("09:00-10:00人流量")

coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java

@@ -27,7 +27,7 @@ public class MiniAddPointRequest {
     @ApiModelProperty("详细地址")
     private String address;
 
-    @ApiModelProperty("经营状况")
+    @ApiModelProperty("经营状况 1营业中 2空铺")
     private Integer businessStatus;
 
     @ApiModelProperty("使用面积(一楼)")

coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java

@@ -230,6 +230,9 @@ public class PointDetailVO {
     @ApiModelProperty("图片对象")
     private String pictureObj;
 
+    @ApiModelProperty("当前节点")
+    private Integer curNodeNo;
+
 
     public static PointDetailVO convertVO(PointInfoDO pointInfo, PointDetailInfoDO pointDetailInfo) {
         PointDetailVO result = new PointDetailVO();

coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java

@@ -29,7 +29,7 @@ public interface PointService {
      * @param pointId
      * @return
      */
-    PointDetailVO getPointDetailInfo(Long pointId);
+    PointDetailVO getPointDetailInfo(Long pointId, Boolean isGetNodeNo);
 
     /**
      * 更新铺位

coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java

@@ -99,7 +99,7 @@ public class PointServiceImpl implements PointService {
     }
 
     @Override
-    public PointDetailVO getPointDetailInfo(Long pointId) {
+    public PointDetailVO getPointDetailInfo(Long pointId, Boolean isGetNodeNo) {
         PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
         if(Objects.isNull(pointInfo)){
             log.error("铺位基本信息不存在");
@@ -110,7 +110,11 @@ public class PointServiceImpl implements PointService {
             log.error("铺位详情信息不存在");
             throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
         }
-        return PointDetailVO.convertVO(pointInfo, pointDetailInfo);
+        PointDetailVO result = PointDetailVO.convertVO(pointInfo, pointDetailInfo);
+        if(Objects.nonNull(isGetNodeNo) && isGetNodeNo){
+            result.setCurNodeNo(pointTodoInfoDAO.getCurNodeNoByPoint(pointId));
+        }
+        return result;
     }
 
     @Override

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java

@@ -38,8 +38,9 @@ public class PointController {
 
     @ApiOperation("铺位详情")
     @GetMapping("/detail")
-    public ResponseResult<PointDetailVO> getPointDetailInfo(@RequestParam("pointId")Long pointId) {
+    public ResponseResult<PointDetailVO> getPointDetailInfo(@RequestParam("pointId")Long pointId,
-        return ResponseResult.success(pointService.getPointDetailInfo(pointId));
+                                                            @RequestParam(value = "isGetNodeNo", required = false)Boolean isGetNodeNo) {
+        return ResponseResult.success(pointService.getPointDetailInfo(pointId, isGetNodeNo));
     }
 
     @ApiOperation("完善铺位")

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java

@@ -66,8 +66,9 @@ public class MiniShopController {
 
     @ApiOperation("铺位详情")
     @GetMapping("/detail")
-    public ResponseResult<PointDetailVO> getPointDetailInfo(@RequestParam("pointId")Long pointId) {
+    public ResponseResult<PointDetailVO> getPointDetailInfo(@RequestParam("pointId")Long pointId,
-        return ResponseResult.success(pointService.getPointDetailInfo(pointId));
+                                                            @RequestParam(value = "isGetNodeNo", required = false)Boolean isGetNodeNo) {
+        return ResponseResult.success(pointService.getPointDetailInfo(pointId, isGetNodeNo));
     }
 
     @ApiOperation("选择铺位")