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

Merge branch 'cc_20250812_addField' into 'master'

Browse Source 
合同加字段

See merge request hangzhou/java/custom_zxjp!150
This commit is contained in:
苏竹红
2025-08-12 10:09:16 +00:00
parent 47caa1c5b6 63d1059a37
commit 4a222b7a64
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,4 +83,7 @@ public class SignFranchiseDO {
//签约人1第几家分店 //签约人1第几家分店
@Column(name = "partnership_signatory_first_which_store") @Column(name = "partnership_signatory_first_which_store")
private Integer partnershipSignatoryFirstWhichStore; private Integer partnershipSignatoryFirstWhichStore;
//是否统管 ： 1-统管，0-不统管',
@Column(name = "unified_management")
private Integer unifiedManagement;
} }

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

@@ -149,6 +149,9 @@ public class AddSignFranchiseRequest {
@NotNull(message = "门店属性（装修）不能为空") @NotNull(message = "门店属性（装修）不能为空")
private Integer shopDecorationAttributes; private Integer shopDecorationAttributes;
@ApiModelProperty("是否统管 ： 1-统管，0-不统管")
private Integer unifiedManagement;
public SignFranchiseDO toSignFranchiseDO() { public SignFranchiseDO toSignFranchiseDO() {
@@ -180,6 +183,7 @@ public class AddSignFranchiseRequest {
signFranchiseDO.setIntroduceStore(this.introduceStore); signFranchiseDO.setIntroduceStore(this.introduceStore);
signFranchiseDO.setIntroductionAward(this.introductionAward); signFranchiseDO.setIntroductionAward(this.introductionAward);
signFranchiseDO.setPartnershipSignatoryFirstWhichStore(this.partnershipSignatoryFirstWhichStore); signFranchiseDO.setPartnershipSignatoryFirstWhichStore(this.partnershipSignatoryFirstWhichStore);
signFranchiseDO.setUnifiedManagement(this.unifiedManagement);
return signFranchiseDO; return signFranchiseDO;
} }

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

@@ -238,4 +238,8 @@ public class AddSignFranchiseResponse {
@ApiModelProperty("门店装修属性 0-新开店 1-老店新开 2-老店翻新 3-迁址") @ApiModelProperty("门店装修属性 0-新开店 1-老店新开 2-老店翻新 3-迁址")
private Integer shopDecorationAttributes; private Integer shopDecorationAttributes;
@ApiModelProperty("是否统管 ： 1-统管，0-不统管")
private Integer unifiedManagement;
} }

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -523,6 +523,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setManagerRegionName(managerRegion.getName()); addSignFranchiseResponse.setManagerRegionName(managerRegion.getName());
} }
if (Objects.nonNull(signFranchiseDO)) { if (Objects.nonNull(signFranchiseDO)) {
addSignFranchiseResponse.setUnifiedManagement(signFranchiseDO.getUnifiedManagement());
addSignFranchiseResponse.setId(signFranchiseDO.getId()); addSignFranchiseResponse.setId(signFranchiseDO.getId());
addSignFranchiseResponse.setShopId(signFranchiseDO.getShopId()); addSignFranchiseResponse.setShopId(signFranchiseDO.getShopId());
addSignFranchiseResponse.setSignType(signFranchiseDO.getSignType()); addSignFranchiseResponse.setSignType(signFranchiseDO.getSignType());