suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:

Browse Source
This commit is contained in:
guohb
2024-05-16 14:33:44 +08:00
parent 482d73ebd0
commit 0ae893dcfb
6 changed files with 106 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ public class SysStoreAppRequest {
@ApiModelProperty("战区描述")
private String fightDesc;
@ApiModelProperty("战区描述")
@ApiModelProperty("战区编码")
private String fightCode;
@ApiModelProperty("战区名称")
private String fightName;

29
coolstore-partner-model/src/main/java/com/cool/store/response/GetStoreInfoByCodeResponse.java
View File

@@ -1,7 +1,11 @@
package com.cool.store.response;
import cn.hutool.core.date.DateUtil;
import com.cool.store.enums.LicenseTypeEnum;
import lombok.Data;
import java.util.Objects;
@Data
public class GetStoreInfoByCodeResponse {
/**
@@ -161,31 +165,6 @@ public class GetStoreInfoByCodeResponse {
* 备注
*/
private String storeRemark;
public SubmitLicenseResponse.StoreDocument toStoreDocument() {
SubmitLicenseResponse.StoreDocument storeDocument = new SubmitLicenseResponse.StoreDocument();
storeDocument.setStoreBusinessAdd(this.storeBusinessAdd);
storeDocument.setStoreBusinessDate(this.storeBusinessDate);
storeDocument.setStoreBusinessImg(this.storeBusinessImg);
storeDocument.setStoreBusinessName(this.storeBusinessName);
storeDocument.setStoreBusinessNumber(this.storeBusinessNumber);
storeDocument.setStoreBusinessType(this.storeBusinessType);
storeDocument.setStoreBusinessValidPeriod(this.storeBusinessValidPeriod);
storeDocument.setStoreCode(this.storeCode);
storeDocument.setStoreDirector(this.storeDirector);
storeDocument.setStoreFoodLicense(this.storeFoodLicense);
storeDocument.setStoreFoodLicenseBeginDate(this.storeFoodLicenseBeginDate);
storeDocument.setStoreFoodLicenseBusinessAddress(this.storeFoodLicenseBusinessAddress);
storeDocument.setStoreFoodLicenseBusinessScope(this.storeFoodLicenseBusinessScope);
storeDocument.setStoreFoodLicenseEndDate(this.storeFoodLicenseEndDate);
storeDocument.setStoreFoodLicenseImg(this.storeFoodLicenseImg);
storeDocument.setStoreFoodLicenseLegalRepresentative(this.storeFoodLicenseLegalRepresentative);
storeDocument.setStoreFoodLicenseMainBusiness(this.storeFoodLicenseMainBusiness);
storeDocument.setStoreFoodLicenseOperatorName(this.storeFoodLicenseOperatorName);
storeDocument.setStoreRemark(this.storeRemark);
return storeDocument;
}
}

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

@@ -99,82 +99,73 @@ public class SubmitLicenseResponse {
@Data
public static class StoreDocument {
/**
* 营业执照经营场所/住所
*/
private String storeBusinessAdd;
/**
* 营业执照发证日期
*/
private String storeBusinessDate;
/**
* 营业执照图片
*/
private String storeBusinessImg;
/**
* 营业执照名称
*/
private String storeBusinessName;
/**
* 营业执照统一社会信用代码
*/
private String storeBusinessNumber;
/**
* 营业执照类型
*/
private String storeBusinessType;
/**
* 营业执照有效期, 非OCR识别，手填。9=长期有效，非长期有效则为具体日期，例：2026-06-01
*/
private String storeBusinessValidPeriod;
/**
* 门店代码
*/
private String storeCode;
/**
* 营业执照经营者/法人
*/
private String storeDirector;
/**
* 食品流通经营许可证编号
*/
private String storeFoodLicense;
/**
* 食品流通/经营许可证有效期开始日期
*/
private String storeFoodLicenseBeginDate;
/**
* 食品经营许可证经营场所
*/
private String storeFoodLicenseBusinessAddress;
/**
* 食品经营许可证经营项目
*/
private String storeFoodLicenseBusinessScope;
/**
* 食品流通/经营许可证有效期结束日期
*/
private String storeFoodLicenseEndDate;
/**
* 食品经营许可证照片
*/
private String storeFoodLicenseImg;
/**
* 食品经营许可证法定代表人（负责人）
*/
private String storeFoodLicenseLegalRepresentative;
/**
* 食品经营许可证主体业态
*/
private String storeFoodLicenseMainBusiness;
/**
* 食品经营许可证经营者名称
*/
private String storeFoodLicenseOperatorName;
/**
* 备注
*/
private String storeRemark;
@ApiModelProperty("营业执照拍照上传")
private String licenseUrl;
@ApiModelProperty("营业执照名称")
private String licenseName;
@ApiModelProperty("营业执照类型 0:有限责任公司 1:工体工商")
private Integer licenseType;
@ApiModelProperty("营业执照上的法人")
private String licenseLegalPerson;
@ApiModelProperty("统一社会信用代码")
private String socialCreditCode;
@ApiModelProperty("发证日期")
private Date issueTime;
@ApiModelProperty("营业执照经营场所")
private String licenseAddress;
@ApiModelProperty("有效期(如果为空则是长期有效)")
private Date validity;
@ApiModelProperty("有效期类型 0：长期有效（不用传validity） 1：效期内")
private Integer validityType;
@ApiModelProperty("法人双手持身份证正面+营业执照")
private String idCardAndLicense1;
@ApiModelProperty("法人双手持身份证反面+营业执照")
private String idCardAndLicense2;
@ApiModelProperty("食品经营许可证图片上传")
private String foodLicenseUrl;
@ApiModelProperty("经营者")
private String operator;
@ApiModelProperty("食品经营许可证上的法人")
private String foodLicenseLegalPerson;
@ApiModelProperty("食营经营场所")
private String businessPremises;
@ApiModelProperty("主体业态")
private String mainBusiness;
@ApiModelProperty("经营项目")
private String businessProject;
@ApiModelProperty("许可证编号")
private String foodLicenseCode;
@ApiModelProperty("许可证开始时间")
private Date foodLicenseStartTime;
@ApiModelProperty("许可证截止时间")
private Date foodLicenseEndTime;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("备注图片")
private String remarkUrl;
}
public static SubmitLicenseResponse from(GetStoreInfoByCodeResponse storeInfoCode,