新增接口

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

@@ -0,0 +1,46 @@
+package com.cool.store.request;
+
+import com.cool.store.common.PageBasicInfo;
+import com.cool.store.enums.point.PointStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: PointPageRequest
+ * @Description:
+ * @date 2024-04-08 10:28
+ */
+@Data
+public class AllPointPageRequest extends PageBasicInfo {
+
+    @ApiModelProperty("铺位名称或编号")
+    private String keyword;
+
+    @ApiModelProperty("选择区域")
+    private List<String> regionIds;
+
+    @ApiModelProperty(value = "拓展专员")
+    private String developmentManager;
+
+    @ApiModelProperty("1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效")
+    private Integer pointStatus;
+
+    @ApiModelProperty("创建时间-开始")
+    private String createStartTime;
+
+    @ApiModelProperty("创建时间-结束")
+    private String createEndTime;
+
+    @ApiModelProperty(value = "当前登录用户", hidden = true)
+    private String curUserId;
+
+    @ApiModelProperty(value = "管辖区域",hidden = true)
+    private List<String> authRegionIds;
+
+}

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

@@ -23,6 +23,9 @@ public class PointPageRequest extends PageBasicInfo {
     @ApiModelProperty("铺位名称或编号")
     private String keyword;
 
+    @ApiModelProperty("选择区域")
+    private List<String> regionIds;
+
     @ApiModelProperty("营运人员")
     private String operateUserId;
 

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

@@ -14,6 +14,9 @@ public class PointDetailVO {
     @ApiModelProperty("店铺id")
     private Long pointId;
 
+    @ApiModelProperty("店铺id")
+    private Long shopId;
+
     @ApiModelProperty("铺位名称")
     private String pointName;
 
@@ -231,6 +234,7 @@ public class PointDetailVO {
     public static PointDetailVO convertVO(PointInfoDO pointInfo, PointDetailInfoDO pointDetailInfo) {
         PointDetailVO result = new PointDetailVO();
         result.setPointId(pointInfo.getId());
+        result.setShopId(pointInfo.getShopId());
         result.setPointName(pointInfo.getPointName());
         result.setPointCode(pointInfo.getPointCode());
         result.setLongitude(pointInfo.getLongitude());