From 55c7101dbf884ed0bf3331e31092153406742d51 Mon Sep 17 00:00:00 2001 From: guohb Date: Fri, 17 May 2024 16:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/AddSignFranchiseRequest.java | 2 +- .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8a3447ea3..1decb1ae3 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 @@ -26,7 +26,7 @@ public class AddSignFranchiseRequest { @ApiModelProperty("是否有营业执照 0-是 1-否") private Integer isBusinessLicense; - @ApiModelProperty("是否有食营 0-是 1-否") + @ApiModelProperty("是否有食营 0-是 2-否[二证合一] 3-否[[三小一摊] 4-否[暂未办理]") private Integer isFoodLicense; @ApiModelProperty("合同开始日期") 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 f03583058..d6707c251 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 @@ -378,7 +378,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu if (Objects.nonNull(lineInfoDO)) { addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername()); } - if (Objects.nonNull(signingBaseInfoDO)) { + if (Objects.nonNull(signingBaseInfoDO) && Objects.nonNull(memberQuestionDO)) { if (JoinTypeEnum.JOIN_TYPE_ONE.getCode().equals(memberQuestionDO.getJoinType())) { addSignFranchiseResponse.setIdCardNo(signingBaseInfoDO.getIdCardNo()); } else if (JoinTypeEnum.JOIN_TYPE_TWO.getCode().equals(memberQuestionDO.getJoinType())) {