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

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

Browse Source
This commit is contained in:
苏竹红
2025-05-08 14:15:46 +08:00
parent cd60b26680 626ce23c3d
commit d17ad59431
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,11 +75,11 @@ public class SignFranchiseDO {
@Column(name = "introducer")
private String introducer;
//介绍门店
@Column(name = "introducer_store")
private String introducerStore;
@Column(name = "introduce_store")
private String introduceStore;
//介绍奖
@Column(name = "introducer_award")
private String introducerAward;
@Column(name = "introduction_award")
private String introductionAward;
//签约人1第几家分店
@Column(name = "partnership_signatory_first_which_store")
private Integer partnershipSignatoryFirstWhichStore;

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

@@ -110,10 +110,10 @@ public class AddSignFranchiseRequest {
private String introducer;
//介绍门店
@ApiModelProperty("介绍门店")
private String introducerStore;
private String introduceStore;
//介绍奖
@ApiModelProperty("介绍奖")
private String introducerAward;
private String introductionAward;
//签约人1第几家分店
@ApiModelProperty("签约人1第几家分店")
@NotNull(message = "签约人1第哪家分店不能为空")
@@ -168,8 +168,8 @@ public class AddSignFranchiseRequest {
signFranchiseDO.setPartnershipSignatorySecondMobile(this.partnershipSignatorySecondMobile);
signFranchiseDO.setProtectiveDistance(this.protectiveDistance);
signFranchiseDO.setIntroducer(this.introducer);
signFranchiseDO.setIntroducerStore(this.introducerStore);
signFranchiseDO.setIntroducerAward(this.introducerAward);
signFranchiseDO.setIntroduceStore(this.introduceStore);
signFranchiseDO.setIntroductionAward(this.introductionAward);
signFranchiseDO.setPartnershipSignatoryFirstWhichStore(this.partnershipSignatoryFirstWhichStore);
return signFranchiseDO;
}

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

@@ -204,10 +204,10 @@ public class AddSignFranchiseResponse {
private String introducer;
//介绍门店
@ApiModelProperty("介绍门店")
private String introducerStore;
private String introduceStore;
//介绍奖
@ApiModelProperty("介绍奖")
private String introducerAward;
private String introductionAward;
//签约人1第几家分店
@ApiModelProperty("签约人1第几家分店")
private Integer partnershipSignatoryFirstWhichStore;

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

@@ -464,8 +464,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setPartnershipSignatorySecondMobile(signFranchiseDO.getPartnershipSignatorySecondMobile());
addSignFranchiseResponse.setProtectiveDistance(signFranchiseDO.getProtectiveDistance());
addSignFranchiseResponse.setIntroducer(signFranchiseDO.getIntroducer());
addSignFranchiseResponse.setIntroducerStore(signFranchiseDO.getIntroducerStore());
addSignFranchiseResponse.setIntroducerAward(signFranchiseDO.getIntroducerAward());
addSignFranchiseResponse.setIntroduceStore(signFranchiseDO.getIntroduceStore());
addSignFranchiseResponse.setIntroductionAward(signFranchiseDO.getIntroductionAward());
addSignFranchiseResponse.setPartnershipSignatoryFirstWhichStore(signFranchiseDO.getPartnershipSignatoryFirstWhichStore());
} else {