diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/prepare/newStore/PassengerFlowEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/prepare/newStore/PassengerFlowEnum.java index 023f6e686..ff601c345 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/prepare/newStore/PassengerFlowEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/prepare/newStore/PassengerFlowEnum.java @@ -6,9 +6,9 @@ import java.util.function.Function; import java.util.stream.Collectors; public enum PassengerFlowEnum { - BELOW_1000(0,"1000以下"), - TO_1000_10000(1,"1000-1万"), - MORE_THAN_10000(2,"1万以上"), + BELOW_1000(0,"1000以下",10), + TO_1000_10000(1,"1000-1万",20), + MORE_THAN_10000(2,"1万以上",30), @@ -16,10 +16,12 @@ public enum PassengerFlowEnum { private Integer code; private String desc; + private Integer type; - PassengerFlowEnum(Integer code, String desc) { + PassengerFlowEnum(Integer code, String desc,Integer type) { this.code = code; this.desc = desc; + this.type = type; } public Integer getCode() { @@ -38,6 +40,14 @@ public enum PassengerFlowEnum { this.desc = desc; } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public static final Map map = Arrays.stream(values()).collect(Collectors.toMap(PassengerFlowEnum::getCode, Function.identity())); 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())) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index ef59ad550..824a25b7e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -383,7 +383,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe // zmdzt newStoreRequest.setZmdzt(10); // zmrjkllzs1 - newStoreRequest.setZmrjkllzs1(sysStoreAppRequest.getStoreDetail().getAverageDailyRs()); + newStoreRequest.setZmrjkllzs1(PassengerFlowEnum.getByCode(sysStoreAppRequest.getStoreDetail().getAverageDailyRs()).getType()); // zppsyfy newStoreRequest.setZppsyfy(0.05); // zq