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

coolstore-partner-model/src/main/java/com/cool/store/entity/OpenAcceptanceInfoDO.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_open_acceptance_info")
 public class OpenAcceptanceInfoDO {
     @Id
@@ -43,72 +52,72 @@ public class OpenAcceptanceInfoDO {
      * 系统建店是否合格 0-不合格 1-合格
      */
     @Column(name = "system_setup")
-    private Byte systemSetup;
+    private Boolean systemSetup;
 
     /**
      * 证照办理是否合格
      */
     @Column(name = "license_processing")
-    private Byte licenseProcessing;
+    private Boolean licenseProcessing;
 
     /**
      * 缴纳加盟费/保证金是否合格
      */
     @Column(name = "franchise_fee_deposit")
-    private Byte franchiseFeeDeposit;
+    private Boolean franchiseFeeDeposit;
 
     /**
      * 加盟合同签约是否合格
      */
     @Column(name = "contract_signing")
-    private Byte contractSigning;
+    private Boolean contractSigning;
 
     /**
      * 培训登记是否合格
      */
     @Column(name = "training_registration")
-    private Byte trainingRegistration;
+    private Boolean trainingRegistration;
 
     /**
      * 加盟商/员工培训是否合格
      */
     @Column(name = "training_for_franchisee")
-    private Byte trainingForFranchisee;
+    private Boolean trainingForFranchisee;
 
     /**
      * 新店设计是否合格
      */
     @Column(name = "store_design")
-    private Byte storeDesign;
+    private Boolean storeDesign;
 
     /**
      * 工程施工是否合格
      */
-    private Byte construction;
+    private Boolean construction;
 
     /**
      * 三方验收是否合格
      */
     @Column(name = "triple_acceptance")
-    private Byte tripleAcceptance;
+    private Boolean tripleAcceptance;
 
     /**
      * 视觉验收是否合格
      */
     @Column(name = "visual_acceptance")
-    private Byte visualAcceptance;
+    private Boolean visualAcceptance;
 
     /**
      * 市调和活动策划是否合格
      */
     @Column(name = "market_planning")
-    private Byte marketPlanning;
+    private Boolean marketPlanning;
 
     /**
      * 首批配送清单是否合格
      */
     @Column(name = "initial_delivery_list")
-    private Byte initialDeliveryList;
+    private Boolean initialDeliveryList;
 
     /**
      * 删除标识
@@ -127,359 +136,4 @@ public class OpenAcceptanceInfoDO {
     @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 plan_open_time - 计划开业时间
-     */
-    public Date getPlanOpenTime() {
-        return planOpenTime;
-    }
-
-    /**
-     * 设置计划开业时间
-     *
-     * @param planOpenTime 计划开业时间
-     */
-    public void setPlanOpenTime(Date planOpenTime) {
-        this.planOpenTime = planOpenTime;
-    }
-
-    /**
-     * 获取验收状态
-     *
-     * @return acceptance_status - 验收状态
-     */
-    public Integer getAcceptanceStatus() {
-        return acceptanceStatus;
-    }
-
-    /**
-     * 设置验收状态
-     *
-     * @param acceptanceStatus 验收状态
-     */
-    public void setAcceptanceStatus(Integer acceptanceStatus) {
-        this.acceptanceStatus = acceptanceStatus;
-    }
-
-    /**
-     * 获取验收时间
-     *
-     * @return acceptance_time - 验收时间
-     */
-    public Date getAcceptanceTime() {
-        return acceptanceTime;
-    }
-
-    /**
-     * 设置验收时间
-     *
-     * @param acceptanceTime 验收时间
-     */
-    public void setAcceptanceTime(Date acceptanceTime) {
-        this.acceptanceTime = acceptanceTime;
-    }
-
-    /**
-     * 获取系统建店是否合格 0-不合格 1-合格
-     *
-     * @return system_setup - 系统建店是否合格 0-不合格 1-合格
-     */
-    public Byte getSystemSetup() {
-        return systemSetup;
-    }
-
-    /**
-     * 设置系统建店是否合格 0-不合格 1-合格
-     *
-     * @param systemSetup 系统建店是否合格 0-不合格 1-合格
-     */
-    public void setSystemSetup(Byte systemSetup) {
-        this.systemSetup = systemSetup;
-    }
-
-    /**
-     * 获取证照办理是否合格
-     *
-     * @return license_processing - 证照办理是否合格
-     */
-    public Byte getLicenseProcessing() {
-        return licenseProcessing;
-    }
-
-    /**
-     * 设置证照办理是否合格
-     *
-     * @param licenseProcessing 证照办理是否合格
-     */
-    public void setLicenseProcessing(Byte licenseProcessing) {
-        this.licenseProcessing = licenseProcessing;
-    }
-
-    /**
-     * 获取缴纳加盟费/保证金是否合格
-     *
-     * @return franchise_fee_deposit - 缴纳加盟费/保证金是否合格
-     */
-    public Byte getFranchiseFeeDeposit() {
-        return franchiseFeeDeposit;
-    }
-
-    /**
-     * 设置缴纳加盟费/保证金是否合格
-     *
-     * @param franchiseFeeDeposit 缴纳加盟费/保证金是否合格
-     */
-    public void setFranchiseFeeDeposit(Byte franchiseFeeDeposit) {
-        this.franchiseFeeDeposit = franchiseFeeDeposit;
-    }
-
-    /**
-     * 获取加盟合同签约是否合格
-     *
-     * @return contract_signing - 加盟合同签约是否合格
-     */
-    public Byte getContractSigning() {
-        return contractSigning;
-    }
-
-    /**
-     * 设置加盟合同签约是否合格
-     *
-     * @param contractSigning 加盟合同签约是否合格
-     */
-    public void setContractSigning(Byte contractSigning) {
-        this.contractSigning = contractSigning;
-    }
-
-    /**
-     * 获取培训登记是否合格
-     *
-     * @return training_registration - 培训登记是否合格
-     */
-    public Byte getTrainingRegistration() {
-        return trainingRegistration;
-    }
-
-    /**
-     * 设置培训登记是否合格
-     *
-     * @param trainingRegistration 培训登记是否合格
-     */
-    public void setTrainingRegistration(Byte trainingRegistration) {
-        this.trainingRegistration = trainingRegistration;
-    }
-
-    /**
-     * 获取加盟商/员工培训是否合格
-     *
-     * @return training_for_franchisee - 加盟商/员工培训是否合格
-     */
-    public Byte getTrainingForFranchisee() {
-        return trainingForFranchisee;
-    }
-
-    /**
-     * 设置加盟商/员工培训是否合格
-     *
-     * @param trainingForFranchisee 加盟商/员工培训是否合格
-     */
-    public void setTrainingForFranchisee(Byte trainingForFranchisee) {
-        this.trainingForFranchisee = trainingForFranchisee;
-    }
-
-    /**
-     * 获取新店设计是否合格
-     *
-     * @return store_design - 新店设计是否合格
-     */
-    public Byte getStoreDesign() {
-        return storeDesign;
-    }
-
-    /**
-     * 设置新店设计是否合格
-     *
-     * @param storeDesign 新店设计是否合格
-     */
-    public void setStoreDesign(Byte storeDesign) {
-        this.storeDesign = storeDesign;
-    }
-
-    /**
-     * 获取工程施工是否合格
-     *
-     * @return construction - 工程施工是否合格
-     */
-    public Byte getConstruction() {
-        return construction;
-    }
-
-    /**
-     * 设置工程施工是否合格
-     *
-     * @param construction 工程施工是否合格
-     */
-    public void setConstruction(Byte construction) {
-        this.construction = construction;
-    }
-
-    /**
-     * 获取三方验收是否合格
-     *
-     * @return triple_acceptance - 三方验收是否合格
-     */
-    public Byte getTripleAcceptance() {
-        return tripleAcceptance;
-    }
-
-    /**
-     * 设置三方验收是否合格
-     *
-     * @param tripleAcceptance 三方验收是否合格
-     */
-    public void setTripleAcceptance(Byte tripleAcceptance) {
-        this.tripleAcceptance = tripleAcceptance;
-    }
-
-    /**
-     * 获取视觉验收是否合格
-     *
-     * @return visual_acceptance - 视觉验收是否合格
-     */
-    public Byte getVisualAcceptance() {
-        return visualAcceptance;
-    }
-
-    /**
-     * 设置视觉验收是否合格
-     *
-     * @param visualAcceptance 视觉验收是否合格
-     */
-    public void setVisualAcceptance(Byte visualAcceptance) {
-        this.visualAcceptance = visualAcceptance;
-    }
-
-    /**
-     * 获取市调和活动策划是否合格
-     *
-     * @return market_planning - 市调和活动策划是否合格
-     */
-    public Byte getMarketPlanning() {
-        return marketPlanning;
-    }
-
-    /**
-     * 设置市调和活动策划是否合格
-     *
-     * @param marketPlanning 市调和活动策划是否合格
-     */
-    public void setMarketPlanning(Byte marketPlanning) {
-        this.marketPlanning = marketPlanning;
-    }
-
-    /**
-     * 获取首批配送清单是否合格
-     *
-     * @return initial_delivery_list - 首批配送清单是否合格
-     */
-    public Byte getInitialDeliveryList() {
-        return initialDeliveryList;
-    }
-
-    /**
-     * 设置首批配送清单是否合格
-     *
-     * @param initialDeliveryList 首批配送清单是否合格
-     */
-    public void setInitialDeliveryList(Byte initialDeliveryList) {
-        this.initialDeliveryList = initialDeliveryList;
-    }
-
-    /**
-     * 获取删除标识
-     *
-     * @return deleted - 删除标识
-     */
-    public Boolean getDeleted() {
-        return deleted;
-    }
-
-    /**
-     * 设置删除标识
-     *
-     * @param deleted 删除标识
-     */
-    public void setDeleted(Boolean deleted) {
-        this.deleted = deleted;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @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/entity/ShopAuditInfoDO.java

@@ -19,7 +19,7 @@ public class ShopAuditInfoDO {
      * 0-视觉验收 1-培训登记审批 2-开业运营方案  3-证照审批
      */
     @Column(name = "audit_type")
-    private Byte auditType;
+    private Integer auditType;
 
     /**
      * 提交人ID
@@ -37,7 +37,7 @@ public class ShopAuditInfoDO {
      * 结果类型 0通过,1拒绝
      */
     @Column(name = "result_type")
-    private Byte resultType;
+    private Integer resultType;
 
     /**
      * 通过原因
@@ -111,7 +111,7 @@ public class ShopAuditInfoDO {
      *
      * @return audit_type - 0-视觉验收 1-培训登记审批 2-开业运营方案  3-证照审批
      */
-    public Byte getAuditType() {
+    public Integer getAuditType() {
         return auditType;
     }
 
@@ -120,7 +120,7 @@ public class ShopAuditInfoDO {
      *
      * @param auditType 0-视觉验收 1-培训登记审批 2-开业运营方案  3-证照审批
      */
-    public void setAuditType(Byte auditType) {
+    public void setAuditType(Integer auditType) {
         this.auditType = auditType;
     }
 
@@ -165,7 +165,7 @@ public class ShopAuditInfoDO {
      *
      * @return result_type - 结果类型 0通过,1拒绝
      */
-    public Byte getResultType() {
+    public Integer getResultType() {
         return resultType;
     }
 
@@ -174,7 +174,7 @@ public class ShopAuditInfoDO {
      *
      * @param resultType 结果类型 0通过,1拒绝
      */
-    public void setResultType(Byte resultType) {
+    public void setResultType(Integer resultType) {
         this.resultType = resultType;
     }
 

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

@@ -19,4 +19,7 @@ public class AuditResultRequest {
 
     @ApiModelProperty("通过/失败原因")
     private String cause = "";
+
+    @ApiModelProperty("门店编码(系统建店时使用)")
+    private String storeNum;
 }

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

@@ -0,0 +1,28 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author byd
+ */
+@Data
+public class ShopAcceptanceRequest {
+
+
+    /**
+     * 店铺id
+     */
+    @ApiModelProperty("店铺id")
+    private Long shopId;
+
+    @ApiModelProperty("开业时间")
+    private Date planOpenTime;
+
+    @ApiModelProperty("店铺子阶段验收结果")
+    private List<ShopStageAcceptanceRequest> shopStageAcceptanceList;
+
+}

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

@@ -0,0 +1,24 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author byd
+ */
+@Data
+public class ShopStageAcceptanceRequest {
+
+
+
+    /**
+     * 店铺阶段
+     */
+    @ApiModelProperty("店铺子阶段")
+    private Integer shopSubStage;
+
+
+    @ApiModelProperty("是否合格 0:不合格 1:合格")
+    private Boolean result;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java

@@ -1,13 +1,10 @@
 package com.cool.store.response;
 
-import com.cool.store.entity.SystemBuildingShopDO;
-import com.cool.store.request.SysStoreAppRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.Objects;
 
 @Data
 public class SysStoreAppResponse {
@@ -29,6 +26,21 @@ public class SysStoreAppResponse {
 
     private SupervisorDetail supervisorDetail;
 
+    private AuditDetail auditDetail;
+
+
+    @Data
+    public static class AuditDetail {
+        @ApiModelProperty("0-视觉验收 1-培训登记审批 2-开业运营方案  3-证照审批 4-系统建店")
+        private Integer auditType;
+        @ApiModelProperty("结果类型 0通过,1拒绝")
+        private Integer resultType;
+        @ApiModelProperty("通过原因")
+        private String passReason;
+        @ApiModelProperty("拒绝原因")
+        private String rejectReason;
+    }
+
     @Data
     @ApiModel("加盟商信息")
     public static class FranInfo {
@@ -54,7 +66,7 @@ public class SysStoreAppResponse {
                 "6-直营门店;" +
                 "7-同异业转化;" +
                 "8-老加盟商迁址开新店")
-        private Integer  franchiseeType;
+        private Integer franchiseeType;
 
         @ApiModelProperty("门店邀约人id")
         private String inviteUserId;
@@ -65,7 +77,7 @@ public class SysStoreAppResponse {
 
     @Data
     @ApiModel("门店信息")
-    public static class StoreDetail{
+    public static class StoreDetail {
         @ApiModelProperty("门店性质")
         private Integer storeNature;
         @ApiModelProperty("门店经营者")
@@ -132,7 +144,7 @@ public class SysStoreAppResponse {
 
     @Data
     @ApiModel("督导相关信息")
-    public static class SupervisorDetail{
+    public static class SupervisorDetail {
 
         @ApiModelProperty("督导姓名")
         private String supervisorName;
@@ -149,6 +161,4 @@ public class SysStoreAppResponse {
     }
 
 
-
-
 }

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

@@ -43,7 +43,7 @@ public class OpenAcceptanceInfoListVO {
     private Long largeRegionId;
 
     @ApiModelProperty("大区名称")
-    private Long largeRegionName;
+    private String largeRegionName;
     @ApiModelProperty("计划开业时间")
     private Date planOpenTime;
     @ApiModelProperty("验收状态 0:未验收 1:已验收")

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

@@ -0,0 +1,51 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * @author byd
+ */
+@Data
+public class ShopStageAcceptanceVO {
+
+    /**
+     * 店铺id
+     */
+    @ApiModelProperty("id")
+    private Long id;
+
+    /**
+     * 店铺id
+     */
+    @ApiModelProperty("店铺id")
+    private Long shopId;
+
+    /**
+     * 店铺阶段
+     */
+    @ApiModelProperty("店铺子阶段")
+    private Integer shopSubStage;
+
+
+    /**
+     * 店铺阶段
+     */
+    @ApiModelProperty("店铺子阶段名称")
+    private String shopSubStageName;
+
+
+    /**
+     * 实际完成时间
+     */
+    @ApiModelProperty("实际完成时间")
+    private String actualCompleteTime;
+
+
+    @ApiModelProperty("是否合格 0:不合格 1:合格")
+    private Boolean result;
+
+}