选址阶段

coolstore-partner-model/src/main/java/com/cool/store/entity/ShopStageInfoDO.java

@@ -39,6 +39,12 @@ public class ShopStageInfoDO {
     @Column(name = "shop_sub_stage_status")
     private Integer shopSubStageStatus;
 
+    /**
+     * 当前阶段是否结束 0未结束  1已结束
+     */
+    @Column(name = "is_terminated")
+    private Boolean isTerminated;
+
     /**
      * 备注
      */

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

@@ -42,6 +42,12 @@ public class PointPageRequest extends PageBasicInfo {
     @ApiModelProperty("1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效")
     private Integer pointStatus;
 
+    @ApiModelProperty("创建时间-开始")
+    private String createStartTime;
+
+    @ApiModelProperty("创建时间-结束")
+    private String createEndTime;
+
     @ApiModelProperty(value = "铺位状态列表", hidden = true)
     private List<Integer> pointStatusList;
 

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

@@ -3,6 +3,7 @@ package com.cool.store.request;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
@@ -20,7 +21,7 @@ public class UpdateWantShopNumRequest {
     private Long lineId;
 
     @NotNull
-    @Min(1)
+    @Min(1)@Max(10)
     @ApiModelProperty("意向开店数量")
     private Integer wantShopNum;
 

coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java

@@ -0,0 +1,39 @@
+package com.cool.store.vo.shop;
+
+import com.cool.store.entity.ShopInfoDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: MiniHomePageShopVO
+ * @Description:
+ * @date 2024-04-11 16:50
+ */
+@Data
+public class MiniShopPageVO {
+
+    @ApiModelProperty("店铺id")
+    private Long shopId;
+
+    @ApiModelProperty("店铺名称")
+    private String shopName;
+
+
+    public MiniShopPageVO(Long shopId, String shopName) {
+        this.shopId = shopId;
+        this.shopName = shopName;
+    }
+
+    public static List<MiniShopPageVO> convertList(List<ShopInfoDO> shopInfoList) {
+        List<MiniShopPageVO> resultList = new ArrayList<>();
+        for (ShopInfoDO shopInfo : shopInfoList) {
+            resultList.add(new MiniShopPageVO(shopInfo.getId(), shopInfo.getShopName()));
+        }
+        return resultList;
+    }
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/shop/ShopStageInfoVO.java

@@ -0,0 +1,51 @@
+package com.cool.store.vo.shop;
+
+import com.cool.store.entity.ShopStageInfoDO;
+import com.google.common.collect.Lists;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: ShopStageInfoVO
+ * @Description:
+ * @date 2024-04-11 17:10
+ */
+@Data
+public class ShopStageInfoVO {
+
+    @ApiModelProperty("店铺阶段")
+    private Integer shopStage;
+
+    @ApiModelProperty("店铺子阶段")
+    private Integer shopSubStage;
+
+    @ApiModelProperty("店铺阶段状态")
+    private Integer shopSubStageStatus;
+
+    @ApiModelProperty("当前阶段是否结束 0未结束  1已结束")
+    private Boolean isTerminated;
+
+    public ShopStageInfoVO(Integer shopStage, Integer shopSubStage, Integer shopSubStageStatus, Boolean isTerminated) {
+        this.shopStage = shopStage;
+        this.shopSubStage = shopSubStage;
+        this.shopSubStageStatus = shopSubStageStatus;
+        this.isTerminated = isTerminated;
+    }
+
+    public static List<ShopStageInfoVO> convertList(List<ShopStageInfoDO> stageList){
+        if(CollectionUtils.isEmpty(stageList)){
+            return Lists.newArrayList();
+        }
+        List<ShopStageInfoVO> resultList = new ArrayList<>();
+        for (ShopStageInfoDO stageInfo : stageList) {
+            resultList.add(new ShopStageInfoVO(stageInfo.getShopStage(), stageInfo.getShopSubStage(), stageInfo.getShopSubStageStatus(), stageInfo.getIsTerminated()));
+        }
+        return resultList;
+    }
+
+}