diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java index 665317bc8..34af719bc 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java @@ -83,4 +83,7 @@ public class SignFranchiseDO { //签约人1第几家分店 @Column(name = "partnership_signatory_first_which_store") private Integer partnershipSignatoryFirstWhichStore; + //是否统管 : 1-统管,0-不统管', + @Column(name = "unified_management") + private Integer unifiedManagement; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index 0d1fe2cba..ab806fa44 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -149,6 +149,9 @@ public class AddSignFranchiseRequest { @NotNull(message = "门店属性(装修)不能为空") private Integer shopDecorationAttributes; + @ApiModelProperty("是否统管 : 1-统管,0-不统管") + private Integer unifiedManagement; + public SignFranchiseDO toSignFranchiseDO() { @@ -180,6 +183,7 @@ public class AddSignFranchiseRequest { signFranchiseDO.setIntroduceStore(this.introduceStore); signFranchiseDO.setIntroductionAward(this.introductionAward); signFranchiseDO.setPartnershipSignatoryFirstWhichStore(this.partnershipSignatoryFirstWhichStore); + signFranchiseDO.setUnifiedManagement(this.unifiedManagement); return signFranchiseDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index a51bf8314..f6537dfe0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -238,4 +238,8 @@ public class AddSignFranchiseResponse { @ApiModelProperty("门店装修属性 0-新开店 1-老店新开 2-老店翻新 3-迁址") private Integer shopDecorationAttributes; + @ApiModelProperty("是否统管 : 1-统管,0-不统管") + private Integer unifiedManagement; + + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 601dba520..4ef57ddd9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -523,6 +523,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setManagerRegionName(managerRegion.getName()); } if (Objects.nonNull(signFranchiseDO)) { + addSignFranchiseResponse.setUnifiedManagement(signFranchiseDO.getUnifiedManagement()); addSignFranchiseResponse.setId(signFranchiseDO.getId()); addSignFranchiseResponse.setShopId(signFranchiseDO.getShopId()); addSignFranchiseResponse.setSignType(signFranchiseDO.getSignType());