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

feat：签约合同优化

Browse Source
This commit is contained in:
shuo.wang
2025-05-08 11:16:40 +08:00
parent b394bdbb3a
commit 6dd365a065
7 changed files with 210 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java
View File

@@ -131,4 +131,22 @@ public class ShopInfoDO {
@Column(name = "store_type")
private Integer storeType;
//省
@Column(name = "province")
private String province;
//省code
@Column(name = "province_code")
private String provinceCode;
//市
@Column(name = "city")
private String city;
//市code
@Column(name = "city_code")
private String cityCode;
//区
@Column(name = "district")
private String district;
//区code
@Column(name = "district_code")
private String districtCode;
}

21
coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java
View File

@@ -62,4 +62,25 @@ public class SignFranchiseDO {
private String partnershipSignatorySecond;
@Column(name = "business_model")
private Integer businessModel;
//签约人2身份证号
@Column(name = "partnership_signatory_second_id_number")
private String partnershipSignatorySecondIdNumber;
//签约人2手机号
@Column(name = "partnership_signatory_second_mobile")
private String partnershipSignatorySecondMobile;
//'保护距离 / m'
@Column(name = "protective_distance")
private Integer protectiveDistance;
//介绍人
@Column(name = "introducer")
private String introducer;
//介绍门店
@Column(name = "introducer_store")
private String introducerStore;
//介绍奖
@Column(name = "introducer_award")
private String introducerAward;
//签约人1第几家分店
@Column(name = "partnership_signatory_first_which_store")
private Integer partnershipSignatoryFirstWhichStore;
}

56
coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
View File

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.text.SimpleDateFormat;
@@ -94,6 +95,54 @@ public class AddSignFranchiseRequest {
private String partnershipSignatoryFirst;
@ApiModelProperty("合伙签约人2")
private String partnershipSignatorySecond;
//签约人2身份证号
@ApiModelProperty("签约人2身份证号")
private String partnershipSignatorySecondIdNumber;
//签约人2手机号
@ApiModelProperty("签约人2手机号")
private String partnershipSignatorySecondMobile;
//'保护距离 / m'
@ApiModelProperty("保护距离 / m")
@NotNull(message = "保护距离不能为空")
private Integer protectiveDistance;
//介绍人
@ApiModelProperty("介绍人")
private String introducer;
//介绍门店
@ApiModelProperty("介绍门店")
private String introducerStore;
//介绍奖
@ApiModelProperty("介绍奖")
private String introducerAward;
//签约人1第几家分店
@ApiModelProperty("签约人1第几家分店")
@NotNull(message = "签约人1第哪家分店不能为空")
private Integer partnershipSignatoryFirstWhichStore;
//省
@ApiModelProperty("省")
@NotBlank(message = "省不能为空")
private String province;
//省code
@ApiModelProperty("省code")
@NotBlank(message = "省code不能为空")
private String provinceCode;
//市
@ApiModelProperty("市")
@NotBlank(message = "市不能为空")
private String city;
//市code
@ApiModelProperty("市code")
@NotBlank(message = "市code不能为空")
private String cityCode;
//区
@ApiModelProperty("区")
@NotBlank(message = "区不能为空")
private String district;
//区code
@ApiModelProperty("区code")
@NotBlank(message = "区code不能为空")
private String districtCode;
public SignFranchiseDO toSignFranchiseDO() {
@@ -118,6 +167,13 @@ public class AddSignFranchiseRequest {
signFranchiseDO.setPartnershipSignatoryFirst(this.partnershipSignatoryFirst);
signFranchiseDO.setPartnershipSignatorySecond(this.partnershipSignatorySecond);
signFranchiseDO.setBusinessModel(this.businessModel);
signFranchiseDO.setPartnershipSignatorySecondIdNumber(this.partnershipSignatorySecondIdNumber);
signFranchiseDO.setPartnershipSignatorySecondMobile(this.partnershipSignatorySecondMobile);
signFranchiseDO.setProtectiveDistance(this.protectiveDistance);
signFranchiseDO.setIntroducer(this.introducer);
signFranchiseDO.setIntroducerStore(this.introducerStore);
signFranchiseDO.setIntroducerAward(this.introducerAward);
signFranchiseDO.setPartnershipSignatoryFirstWhichStore(this.partnershipSignatoryFirstWhichStore);
return signFranchiseDO;
}

42
coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
View File

@@ -190,4 +190,46 @@ public class AddSignFranchiseResponse {
private Integer joinMode;
//签约人2身份证号
@ApiModelProperty("签约人2身份证号")
private String partnershipSignatorySecondIdNumber;
//签约人2手机号
@ApiModelProperty("签约人2手机号")
private String partnershipSignatorySecondMobile;
//'保护距离 / m'
@ApiModelProperty("保护距离 / m")
private Integer protectiveDistance;
//介绍人
@ApiModelProperty("介绍人")
private String introducer;
//介绍门店
@ApiModelProperty("介绍门店")
private String introducerStore;
//介绍奖
@ApiModelProperty("介绍奖")
private String introducerAward;
//签约人1第几家分店
@ApiModelProperty("签约人1第几家分店")
private Integer partnershipSignatoryFirstWhichStore;
//省
@ApiModelProperty("省")
private String province;
//省code
@ApiModelProperty("省code")
private String provinceCode;
//市
@ApiModelProperty("市")
private String city;
//市code
@ApiModelProperty("市code")
private String cityCode;
//区
@ApiModelProperty("区")
private String district;
//区code
@ApiModelProperty("区code")
private String districtCode;
}