From a2e999444ad4b2a5cf9a9e0099ffa26e057e1d19 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 8 May 2024 14:40:10 +0800 Subject: [PATCH] =?UTF-8?q?getDefault=E8=8E=B7=E5=8F=96=E8=AF=81=E7=85=A7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/response/SubmitLicenseResponse.java | 23 +++++++------------ .../service/impl/ApplyLicenseServiceImpl.java | 13 +++++------ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java index 8037623d4..4be947a29 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java @@ -91,19 +91,16 @@ public class SubmitLicenseResponse { @ApiModelProperty("流程记录") private List processRecords; - public static SubmitLicenseResponse from(GetStoreInfoByCodeResponse storeInfoCode){ - if (Objects.isNull(storeInfoCode)){ - return null; + public static SubmitLicenseResponse from(GetStoreInfoByCodeResponse storeInfoCode, + SubmitLicenseResponse submitLicenseResponse){ + if (Objects.isNull(submitLicenseResponse)){ + submitLicenseResponse = new SubmitLicenseResponse(); } - GetStoreInfoByCodeResponse.InnerData data = storeInfoCode.getData(); - GetStoreInfoByCodeResponse.StoreDocument storeDocument = data.getStoreDocument(); + GetStoreInfoByCodeResponse.StoreDocument storeDocument = storeInfoCode.getData().getStoreDocument(); boolean storeBusinessValidPeriod = storeDocument.getStoreBusinessValidPeriod().equals("9"); - SubmitLicenseResponse submitLicenseResponse = new SubmitLicenseResponse(); - submitLicenseResponse.setId(null); - submitLicenseResponse.setShopId(null); submitLicenseResponse.setLicenseType(LicenseTypeEnum.matchName(storeDocument.getStoreBusinessType()).getCode()); submitLicenseResponse.setLicenseLegalPerson(storeDocument.getStoreDirector()); - submitLicenseResponse.setIssueTime(DateUtil.parseTime(storeDocument.getStoreBusinessDate())); + submitLicenseResponse.setIssueTime(DateUtil.parseDate(storeDocument.getStoreBusinessDate())); submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd()); submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); submitLicenseResponse.setOperator(storeDocument.getStoreDirector()); @@ -111,18 +108,14 @@ public class SubmitLicenseResponse { submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope()); submitLicenseResponse.setRemark(storeDocument.getStoreRemark()); - submitLicenseResponse.setRemarkUrl(null); - submitLicenseResponse.setSubmitStatus(null); submitLicenseResponse.setLicenseUrl(storeDocument.getStoreBusinessImg()); submitLicenseResponse.setLicenseName(storeDocument.getStoreBusinessName()); submitLicenseResponse.setSocialCreditCode(storeDocument.getStoreBusinessNumber()); - submitLicenseResponse.setIdCardAndLicense1(null); - submitLicenseResponse.setIdCardAndLicense2(null); submitLicenseResponse.setFoodLicenseUrl(storeDocument.getStoreFoodLicenseImg()); submitLicenseResponse.setBusinessPremises(storeDocument.getStoreFoodLicenseBusinessAddress()); submitLicenseResponse.setFoodLicenseCode(storeDocument.getStoreFoodLicense()); - submitLicenseResponse.setFoodLicenseStartTime(DateUtil.parseTime(storeDocument.getStoreFoodLicenseBeginDate())); - submitLicenseResponse.setFoodLicenseEndTime(DateUtil.parseTime(storeDocument.getStoreFoodLicenseEndDate())); + submitLicenseResponse.setFoodLicenseStartTime(DateUtil.parseDate(storeDocument.getStoreFoodLicenseBeginDate())); + submitLicenseResponse.setFoodLicenseEndTime(DateUtil.parseDate(storeDocument.getStoreFoodLicenseEndDate())); return submitLicenseResponse; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index e32c93d73..a17330024 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -107,8 +107,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { @Override public SubmitLicenseResponse getDefault(Long shopId) { - //todo 业务逻辑问题 @zhy - //1.如果已经提交过证照信息，直接查询后组装数据返回 + //1.如果已经提交过证照信息，直接查询后组装数据 LicenseTransactDO result = applyLicenseMapper.selectByShopId(shopId); SubmitLicenseResponse submitLicenseResponse = new SubmitLicenseResponse(); if (Objects.nonNull(result)){ @@ -131,19 +130,19 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { }); } submitLicenseResponse.setProcessRecords(listByShopIdAndType); - return submitLicenseResponse; } - //2.未查到证照信息，所以查询鲜丰的默认值 + //2.未查到证照信息，所以查询鲜丰的默认值(只要鲜丰接口内有值，总是优先使用鲜丰数据) ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); if (Objects.nonNull(shopInfoDO.getStoreNum())) { GetStoreInfoByCodeResponse storeInfoCode = coolStoreStartFlowService.getStoreInfoCode(shopInfoDO.getStoreNum()); - if (Objects.nonNull(storeInfoCode) && Objects.nonNull(storeInfoCode.getData()) && storeInfoCode.getCode() == 0) { - submitLicenseResponse = SubmitLicenseResponse.from(storeInfoCode); + if (Objects.nonNull(storeInfoCode.getData().getStoreDocument()) && storeInfoCode.getCode() == 0) { + //替换落库的值 + submitLicenseResponse = SubmitLicenseResponse.from(storeInfoCode,submitLicenseResponse); return submitLicenseResponse; } } //3.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写 - return null; + return submitLicenseResponse; } @Override