Merge branch 'cc_partner_init' of http://gitlab.coolcollege.cn/hangzhou/java/custom_xfsg into cc_partner_init

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

@@ -1,8 +1,17 @@
 package com.cool.store.entity;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.util.Date;
 import javax.persistence.*;
 
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Table(name = "xfsg_new_store_opening")
 public class NewStoreOpeningDO {
     @Id
@@ -38,108 +47,4 @@ public class NewStoreOpeningDO {
      */
     @Column(name = "update_time")
     private Date updateTime;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取line_info.id
-     *
-     * @return shop_id - line_info.id
-     */
-    public Long getShopId() {
-        return shopId;
-    }
-
-    /**
-     * 设置line_info.id
-     *
-     * @param shopId line_info.id
-     */
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-
-    /**
-     * 获取待办事项
-     *
-     * @return todo_item - 待办事项
-     */
-    public String getTodoItem() {
-        return todoItem;
-    }
-
-    /**
-     * 设置待办事项
-     *
-     * @param todoItem 待办事项
-     */
-    public void setTodoItem(String todoItem) {
-        this.todoItem = todoItem;
-    }
-
-    /**
-     * 获取完成时间
-     *
-     * @return completion_time - 完成时间
-     */
-    public Date getCompletionTime() {
-        return completionTime;
-    }
-
-    /**
-     * 设置完成时间
-     *
-     * @param completionTime 完成时间
-     */
-    public void setCompletionTime(Date completionTime) {
-        this.completionTime = completionTime;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_time - 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置创建时间
-     *
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取更新时间
-     *
-     * @return update_time - 更新时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 设置更新时间
-     *
-     * @param updateTime 更新时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -0,0 +1,15 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author byd
+ * @date 2024-04-24 16:40
+ */
+@Data
+public class IdRequest {
+
+    @ApiModelProperty("id")
+    private Long id;
+}

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

@@ -0,0 +1,30 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author byd
+ */
+@Data
+public class NewStoreOpeningRequest {
+    /**
+     * line_info.id
+     */
+    @ApiModelProperty("店铺id")
+    private Long shopId;
+
+    /**
+     * 待办事项
+     */
+    @ApiModelProperty("待办事项")
+    private String todoItem;
+
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty("完成时间")
+    private Date completionTime;
+}

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

@@ -0,0 +1,34 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author byd
+ */
+@Data
+public class NewStoreOpeningVO {
+
+    @ApiModelProperty("id")
+    private Long id;
+
+    /**
+     * line_info.id
+     */
+    @ApiModelProperty("店铺id")
+    private Long shopId;
+
+    /**
+     * 待办事项
+     */
+    @ApiModelProperty("待办事项")
+    private String todoItem;
+
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty("完成时间")
+    private Date completionTime;
+}

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

@@ -19,7 +19,7 @@ public class OpenAcceptanceInfoListVO {
     @ApiModelProperty("门店名称")
     private String shopName;
     @ApiModelProperty("门店代码")
-    private String shopCode;
+    private String storeNum;
     @ApiModelProperty("开店负责人id")
     private String shopManagerUserId;
     @ApiModelProperty("开店负责人名称")
@@ -46,6 +46,8 @@ public class OpenAcceptanceInfoListVO {
     private String largeRegionName;
     @ApiModelProperty("计划开业时间")
     private Date planOpenTime;
+    @ApiModelProperty("新店开业结束时间")
+    private Date planOpenEndTime;
     @ApiModelProperty("验收状态 0:未验收 1:已验收")
     private String acceptanceStatus;
     @ApiModelProperty("招商经理id")

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

@@ -0,0 +1,34 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author byd
+ */
+@Data
+public class ShopAcceptanceVO {
+
+
+    /**
+     * 店铺id
+     */
+    @ApiModelProperty("店铺id")
+    private Long shopId;
+
+    @ApiModelProperty("开业时间")
+    private Date planOpenTime;
+
+    /**
+     * 验收状态
+     */
+    @ApiModelProperty("验收状态 0:验收中 1:已验收")
+    private Integer acceptanceStatus;
+
+    @ApiModelProperty("店铺子阶段验收结果")
+    private List<ShopStageAcceptanceVO> shopStageAcceptanceList;
+
+}