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

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

@@ -14,6 +14,8 @@ public class PreparationDTO {
 
     private Long id;
 
+    private Long lineId;
+
     private String shopName;
     
     private String storeNum;
@@ -28,5 +30,9 @@ public class PreparationDTO {
     
     private String mobile;
 
+    private String investmentManager;
+
+    private String supervisorUserId;
+
 
 }

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

@@ -37,6 +37,9 @@ public class SubmitLicenseRequest {
     @ApiModelProperty("营业执照经营场所")
     private String licenseAddress;
 
+    @ApiModelProperty("有效期类型 0：长期有效（不用传validity） 1：效期内")
+    private Integer validityType;
+
     @ApiModelProperty("有效期")
     private Date validity;
 
@@ -96,32 +99,22 @@ public class SubmitLicenseRequest {
         licenseTransactDO.setBusinessProject(this.businessProject);
         licenseTransactDO.setRemark(this.remark);
         licenseTransactDO.setRemarkUrl(this.remarkUrl);
-        // Not mapped LicenseTransactDO fields:
-        // shopId
         licenseTransactDO.setShopId(this.shopId);
-        // businessLicense
         licenseTransactDO.setBusinessLicense(this.licenseName);
-        // creditCode
         licenseTransactDO.setCreditCode(this.socialCreditCode);
-        // creditUrl
         licenseTransactDO.setCreditUrl(this.licenseUrl);
-        // validity
-        licenseTransactDO.setValidity(this.validity);
-        // idCardPositiveCreditUrl
+        if (this.validityType == 0){
+            licenseTransactDO.setValidity(null);
+        }else if (this.validityType == 1){
+            licenseTransactDO.setValidity(this.validity);
+        }
         licenseTransactDO.setIdCardPositiveCreditUrl(this.idCardAndLicense1);
-        // idCardNegativeCreditUrl
         licenseTransactDO.setIdCardNegativeCreditUrl(this.idCardAndLicense2);
-        // foodBusinessLicenseCode
         licenseTransactDO.setFoodBusinessLicenseCode(this.foodLicenseCode);
-        // foodLicenseAddress
         licenseTransactDO.setFoodLicenseAddress(this.businessPremises);
-        // foodBusinessStartTime
         licenseTransactDO.setFoodBusinessStartTime(this.foodLicenseStartTime);
-        // foodBusinessEndTime
         licenseTransactDO.setFoodBusinessEndTime(this.foodLicenseEndTime);
-        // foodBusinessLicenseUrl
-        licenseTransactDO.setFoodBusinessLicenseUrl(this.getFoodLicenseUrl());
-        // submitStatus
+        licenseTransactDO.setFoodBusinessLicenseUrl(this.foodLicenseUrl);
         licenseTransactDO.setSubmitStatus(this.submitStatus);
         return licenseTransactDO;
     }

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

@@ -39,7 +39,7 @@ public class SubmitLicenseResponse {
     @ApiModelProperty("营业执照经营场所")
     private String licenseAddress;
 
-    @ApiModelProperty("有效期")
+    @ApiModelProperty("有效期(如果为空则是长期有效)")
     private Date validity;
 
 

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

@@ -11,8 +11,41 @@ public class BusinessLicenseInfoVO {
     @ApiModelProperty("公司地址")
     private String address;
 
+    @ApiModelProperty("法人")
+    private String legalPerson;
+
+    @ApiModelProperty("有效期")
+    private String validPeriod;
+
+    @ApiModelProperty("建立日期")
+    private String establishDate;
+
+    @ApiModelProperty("营业执照名称")
+    private String name;
+
+    @ApiModelProperty("类型")
+    private String type;
+
     public BusinessLicenseInfoVO(String registerNumber, String address) {
         this.registerNumber = registerNumber;
         this.address = address;
     }
+
+    public BusinessLicenseInfoVO(String registerNumber, String address, String legalPerson, String validPeriod, String establishDate) {
+        this.registerNumber = registerNumber;
+        this.address = address;
+        this.legalPerson = legalPerson;
+        this.validPeriod = validPeriod;
+        this.establishDate = establishDate;
+    }
+
+    public BusinessLicenseInfoVO(String registerNumber, String address, String legalPerson, String validPeriod, String establishDate, String name, String type) {
+        this.registerNumber = registerNumber;
+        this.address = address;
+        this.legalPerson = legalPerson;
+        this.validPeriod = validPeriod;
+        this.establishDate = establishDate;
+        this.name = name;
+        this.type = type;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.cool.store.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FoodLicenseVO {
+    @ApiModelProperty("经营者名称")
+    private String operatorName;
+    @ApiModelProperty("法人")
+    private String legalRepresentative;
+    @ApiModelProperty("经营场所")
+    private String businessAddress;
+    @ApiModelProperty("主体业态")
+    private String mainBusiness;
+    @ApiModelProperty("经营项目")
+    private String businessScope;
+    @ApiModelProperty("许可证编号")
+    private String licenceNumber;
+}

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

@@ -50,6 +50,15 @@ public class PreparationScheduleVO {
     @ApiModelProperty("所属站区")
     private String regionNodeName;
 
+    @ApiModelProperty("招商经理名称")
+    private String investmentManagerName;
+
+    private Long lineId;
+
+
+    @ApiModelProperty("督导")
+    private String supervisionName;
+
     public void setDays() {
         if (this.planOpenTime==null|| this.ContractCompletionTime==null){
             return;