Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

coolstore-partner-model/src/main/java/com/cool/store/dto/SmallVideoDTO.java

@@ -0,0 +1,60 @@
+package com.cool.store.dto;
+
+import lombok.Data;
+
+/**
+ * 上传的视频
+ *
+ * @author chenyupeng
+ * @since 2021/10/9
+ */
+@Data
+public class SmallVideoDTO {
+
+    /**
+     * 视频id
+     */
+    private String videoId;
+
+    /**
+     * 视频url
+     */
+    private String videoUrl;
+
+    /**
+     * 原视频url
+     */
+    private String videoUrlBefore;
+
+    /**
+     * 视频截图封面
+     */
+    private String videoSnapshot;
+
+    /**
+     * 视频大小
+     */
+    private Long size;
+
+    /**
+     * 转码状态
+     * @see com.coolcollege.intelligent.common.enums.video.ResourceStatusEnum
+     */
+    private Integer status;
+
+    /**
+     * 上传是否完成
+     */
+    private boolean uploadStatus = false;
+
+    /**
+     * 截图是否完成
+     */
+    private boolean snapShotStatus = false;
+
+    /**
+     * 转码是否完成
+     */
+    private boolean transCodeStatus = false;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/SmallVideoInfoDTO.java

@@ -0,0 +1,24 @@
+package com.cool.store.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author chenyupeng
+ * @since 2021/10/12
+ */
+@Data
+public class SmallVideoInfoDTO {
+
+    /**
+     * 视频集合
+     */
+    private List<SmallVideoDTO> videoList;
+
+    /**
+     * 音频合计
+     */
+    private List<String> soundRecordingList;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java

@@ -15,12 +15,12 @@ import java.util.Date;
  */
 @Data
 public class FirstOrderDTO {
-
+    private Long id;
     @ApiModelProperty("店铺Id")
     private Long shopId;
     @ApiModelProperty("首批订货金总额")
     private String totalOrderDeposit;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
     @ApiModelProperty("最晚打款时间")
     private Date latestPaymentDate;
 

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-public class LicenseListRequest extends PageBasicInfo {
+public class LicenseListRequest extends PageBasicInfo{
 
     @ApiModelProperty("门店名称")
     private String storeName;
@@ -21,5 +21,13 @@ public class LicenseListRequest extends PageBasicInfo {
     @ApiModelProperty("审核状态 1：待通过 2：未通过 3：已通过")
     private Integer status;
 
-
+    public LicenseListRequest(Integer pageNum,Integer pageSize,String storeName, Long submitStartTime, Long submitEndTime, String regionId, Integer status) {
+        setPageNum(pageNum);
+        setPageSize(pageSize);
+        this.storeName = storeName;
+        this.submitStartTime = submitStartTime;
+        this.submitEndTime = submitEndTime;
+        this.regionId = regionId;
+        this.status = status;
+    }
 }

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

@@ -15,7 +15,6 @@ public class LinePaySubmitRequest {
     private String partnerId;
 
     @ApiModelProperty("line_info.id")
-    @NotNull(message = "线索id不能为空")
     private Long lineId;
 
     @ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败")

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

@@ -39,7 +39,7 @@ public class OpeningOperationPlanRequest {
     @ApiModelProperty("筹备人员ids")
     private List<String>  preparationUserIds;
 
-    @ApiModelProperty("是否完成排车路线")
+    @ApiModelProperty("是否完成排车路线0未完成，1完成")
     private Byte routeCompleted;
 
 

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

@@ -15,7 +15,7 @@ import java.util.List;
  * @注释:
  */
 @Data
-public class PlanListRequest extends PageBasicInfo {
+public class PlanListRequest  {
     @ApiModelProperty("店铺名称")
     private String shopName;
     @ApiModelProperty("起始日期")
@@ -26,8 +26,9 @@ public class PlanListRequest extends PageBasicInfo {
     private List<String> regionIds;
     @ApiModelProperty("审核状态")
     private Integer resultType;
-    @ApiModelProperty(value = "当前登录用户", hidden = true)
-    private String curUserId;
-    @ApiModelProperty(value = "管辖区域",hidden = true)
-    private List<String> authRegionIds;
+    @ApiModelProperty ("页码")
+    private Integer pageNumber;
+    @ApiModelProperty ("分页大小")
+    private Integer pageSize;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java

@@ -28,5 +28,5 @@ public class DecorationStageVO {
     @ApiModelProperty("计划结束时间")
     private String planEndTime;
     @ApiModelProperty("实际完成时间")
-    private String actualCompleteTime;
+    private String actualEndTime;
 }