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

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

@@ -1,5 +1,7 @@
 package com.cool.store.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Date;
 import javax.persistence.*;
 
@@ -19,36 +21,42 @@ public class ShopAuditInfoDO {
      * 0-视觉验收 1-培训登记审批 2-开业运营方案  3-证照审批
      */
     @Column(name = "audit_type")
+    @ApiModelProperty("0-视觉验收 1-培训登记审批 2-开业运营方案  3-证照审批")
     private Integer auditType;
 
     /**
      * 提交人ID
      */
     @Column(name = "submitted_user_id")
+    @ApiModelProperty("提交人ID")
     private String submittedUserId;
 
     /**
      * 提交人名称
      */
     @Column(name = "submitted_user_name")
+    @ApiModelProperty("提交人名称")
     private String submittedUserName;
 
     /**
      * 结果类型 0通过,1拒绝
      */
     @Column(name = "result_type")
+    @ApiModelProperty("结果类型 0通过,1拒绝")
     private Integer resultType;
 
     /**
      * 通过原因
      */
     @Column(name = "pass_reason")
+    @ApiModelProperty("通过原因")
     private String passReason;
 
     /**
      * 拒绝原因
      */
     @Column(name = "reject_reason")
+    @ApiModelProperty("拒绝原因")
     private String rejectReason;
 
     /**
@@ -61,6 +69,7 @@ public class ShopAuditInfoDO {
      * 创建时间
      */
     @Column(name = "create_time")
+    @ApiModelProperty("时间")
     private Date createTime;
 
     /**
@@ -75,6 +84,7 @@ public class ShopAuditInfoDO {
     private Boolean deleted;
 
     @Column(name = "data_type")
+    @ApiModelProperty("数据类型 0-提交 1-审批")
     private Integer dataType;
 
     /**
@@ -288,4 +298,12 @@ public class ShopAuditInfoDO {
     public void setDeleted(Boolean deleted) {
         this.deleted = deleted;
     }
+
+    public Integer getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
 }

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

@@ -51,7 +51,7 @@ public class SysStoreAppRequest {
     @Data
     @ApiModel("门店信息")
     public static class StoreDetail{
-        @ApiModelProperty("门店性质")
+        @ApiModelProperty("门店性质 20：加盟 10：直营")
         private Integer storeNature;
         @ApiModelProperty("门店经营者")
         private Integer storeOperator;
@@ -112,6 +112,8 @@ public class SysStoreAppRequest {
         private Integer storeSecurityDeposit;
         @ApiModelProperty("享受加盟费和保证金优惠原因")
         private String reasons;
+        @ApiModelProperty("品牌使用费率")
+        private String usageRate;
 
     }
 

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

@@ -1,11 +1,13 @@
 package com.cool.store.response;
 
 import com.cool.store.entity.LicenseTransactDO;
+import com.cool.store.entity.ShopAuditInfoDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 @ApiModel("提交证照办理响应体")
@@ -83,6 +85,8 @@ public class SubmitLicenseResponse {
     @ApiModelProperty("0:保存 1：提交到待审核 2:未通过 3:已通过 ")
     private Integer submitStatus;
 
+    @ApiModelProperty("流程记录")
+    private List<ShopAuditInfoDO> processRecords;
 
     public static SubmitLicenseResponse from(LicenseTransactDO licenseTransactDO) {
         if (licenseTransactDO == null) {
@@ -103,25 +107,15 @@ public class SubmitLicenseResponse {
         submitLicenseResponse.setRemark(licenseTransactDO.getRemark());
         submitLicenseResponse.setRemarkUrl(licenseTransactDO.getRemarkUrl());
         submitLicenseResponse.setSubmitStatus(licenseTransactDO.getSubmitStatus());
-        // licenseUrl
         submitLicenseResponse.setLicenseUrl(licenseTransactDO.getCreditUrl());
-        // licenseName
         submitLicenseResponse.setLicenseName(licenseTransactDO.getBusinessLicense());
-        // socialCreditCode
         submitLicenseResponse.setSocialCreditCode(licenseTransactDO.getCreditCode());
-        // idCardAndLicense1
         submitLicenseResponse.setIdCardAndLicense1(licenseTransactDO.getIdCardNegativeCreditUrl());
-        // idCardAndLicense2
         submitLicenseResponse.setIdCardAndLicense2(licenseTransactDO.getIdCardPositiveCreditUrl());
-        // foodLicenseUrl
         submitLicenseResponse.setFoodLicenseUrl(licenseTransactDO.getFoodBusinessLicenseUrl());
-        // businessPremises
         submitLicenseResponse.setBusinessPremises(licenseTransactDO.getFoodLicenseAddress());
-        // foodLicenseCode
         submitLicenseResponse.setFoodLicenseCode(licenseTransactDO.getFoodBusinessLicenseCode());
-        // foodLicenseStartTime
         submitLicenseResponse.setFoodLicenseStartTime(licenseTransactDO.getFoodBusinessStartTime());
-        // foodLicenseEndTime
         submitLicenseResponse.setFoodLicenseEndTime(licenseTransactDO.getFoodBusinessEndTime());
         return submitLicenseResponse;
     }

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

@@ -73,6 +73,18 @@ public class SysStoreAppResponse {
 
         @ApiModelProperty("门店邀约人姓名")
         private String storeInviteesName;
+
+        @ApiModelProperty("招商姓名")
+        private String InvestmentName;
+
+        @ApiModelProperty("招商人id")
+        private String InvestmentUserId;
+
+        @ApiModelProperty("门店选址人姓名")
+        private String sitterName;
+
+        @ApiModelProperty("门店选址人id")
+        private String sitterId;
     }
 
     @Data