开业筹备阶段1.0

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

@@ -34,4 +34,7 @@ public class FirstOrderDTO {
     @ApiModelProperty("更新人")
     private String updateUserId;
 
+    @ApiModelProperty("结果")
+    private Integer resultType;
+
 }

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

@@ -31,13 +31,13 @@ public class OpeningOperationPlanDTO {
     private Date submissionTime;
 
     @ApiModelProperty("审核结果,0待审核，1通过，2拒绝")
-    private String resultType;
+    private Integer resultType;
 
     @ApiModelProperty("起始日期")
-    public LocalDate planStartDate;
+    public Date planStartDate;
 
     @ApiModelProperty("结束日期")
-    public LocalDate planEndDate;
+    public Date planEndDate;
 
 
 

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

@@ -103,6 +103,11 @@ public class OpeningOperationPlanDO {
      */
     @Column(name = "audit_id")
     private Long auditId;
+    /**
+     * 审核结果状态：0.待审核 1. 通过 2. 拒绝
+     */
+    @Column(name = "result_type")
+    private Integer resultType;
 
     public Integer getResultType() {
         return resultType;
@@ -112,11 +117,7 @@ public class OpeningOperationPlanDO {
         this.resultType = resultType;
     }
 
-    /**
-     * 审核结果状态：0.待审核 1. 通过 2. 拒绝
-     */
-    @Column(name = "result_type")
-    private Integer resultType;
+
 
 
 

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @Auther: WangShuo
@@ -16,15 +17,17 @@ public class PlanListRequest {
     @ApiModelProperty("店铺名称")
     private String shopName;
     @ApiModelProperty("起始日期")
-    private LocalDate planStartDate;
+    private Date planStartDate;
     @ApiModelProperty("结束日期")
-    private LocalDate planEndDate;
+    private Date planEndDate;
     @ApiModelProperty("大区名称")
     private String bigName;
     @ApiModelProperty("战区名称")
     private String fightName;
-    @ApiModelProperty("分页数据量")
-    private Integer pageNum;
+    @ApiModelProperty("审核状态")
+    private Integer resultType;
     @ApiModelProperty("页数")
+    private Integer pageNum;
+    @ApiModelProperty("分页数据量")
     private Integer pageSize;
 }

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

@@ -0,0 +1,21 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/25/下午6:58
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class OpenPreparationFlushVO {
+
+    private Long shopId;
+    @ApiModelProperty("开业运营方案阶段状态")
+    private Integer openPlanState;
+    @ApiModelProperty("首批订货金阶段状态")
+    private Integer firstOderState;
+
+}

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

@@ -57,5 +57,5 @@ public class OpeningOperationPlanListVO {
     private Date submissionTime;
 
     @ApiModelProperty("审核结果,0待审核，1通过，2拒绝")
-    private String resultType;
+    private Integer resultType;
 }

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

@@ -42,5 +42,5 @@ public class OpeningOperationPlanVO {
     private String passReason;
 
     @ApiModelProperty("审核结果,0待审核，1通过，2拒绝")
-    private String resultType;
+    private Integer resultType;
 }