From 5f1b9a77e658489b48ba3424be6011ac86932005 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 13:44:40 +0800 Subject: [PATCH 1/4] api --- .../java/com/cool/store/response/SubmitLicenseResponse.java | 2 +- .../java/com/cool/store/service/impl/KdzApiServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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 552346912..75b391a16 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 @@ -27,7 +27,7 @@ public class SubmitLicenseResponse { @ApiModelProperty("营业执照名称") private String licenseName; - @ApiModelProperty("营业执照类型 0:有限责任公司 1:工体工商") + @ApiModelProperty("营业执照类型 0.个体工商户 1.有限责任公司 2.独资企业 3.自然人经营") private Integer licenseType; @ApiModelProperty("营业执照上的法人") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java index 07efdca9b..72e0cf77f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java @@ -64,7 +64,7 @@ public class KdzApiServiceImpl implements KdzApiService { .storeBusinessType(Objects.requireNonNull(LicenseTypeEnum.match(licenseTransactDO.getLicenseType())).getMessage()) .storeBusinessValidPeriod(Objects.isNull(licenseTransactDO.getValidity()) ? "9" : DateUtils.dateTime(licenseTransactDO.getValidity())) .storeCode(storeNum) - .storeDirector(licenseTransactDO.getLicenseLegalPerson()) + .storeDirector(licenseTransactDO.getOperator()) .storeFoodLicense(licenseTransactDO.getFoodBusinessLicenseCode()) .storeFoodLicenseBeginDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessStartTime())) .storeFoodLicenseEndDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessEndTime())) From 6112fdaf670ac79aa270743fe4e1f391ec34adfb Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 13:54:25 +0800 Subject: [PATCH 2/4] api --- .../java/com/cool/store/response/SubmitLicenseResponse.java | 2 +- .../com/cool/store/service/impl/ApplyLicenseServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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 75b391a16..4e76eba16 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 @@ -181,7 +181,7 @@ public class SubmitLicenseResponse { submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd()); submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); - submitLicenseResponse.setOperator(storeDocument.getStoreDirector()); + submitLicenseResponse.setOperator(storeDocument.getStoreFoodLicenseOperatorName()); submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName()); submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope()); 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 7aa4443d7..1e9c5f849 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 @@ -193,7 +193,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); submitLicenseResponse.setOperator(storeDocument.getStoreDirector()); - submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName()); + submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseLegalRepresentative()); submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope()); submitLicenseResponse.setRemark(storeDocument.getStoreRemark()); From 3cdd6c05bb70408c6aed25b2c9ab6fc3f11fc9e3 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 14:03:39 +0800 Subject: [PATCH 3/4] api --- .../java/com/cool/store/response/SubmitLicenseResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4e76eba16..8f9a730e0 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 @@ -182,7 +182,7 @@ public class SubmitLicenseResponse { submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); submitLicenseResponse.setOperator(storeDocument.getStoreFoodLicenseOperatorName()); - submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName()); + submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseLegalRepresentative()); submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope()); submitLicenseResponse.setRemark(storeDocument.getStoreRemark()); From e6a7537f00b123cdcf9884ed915896e366365a8a Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 14:24:41 +0800 Subject: [PATCH 4/4] api --- .../store/service/impl/KdzApiServiceImpl.java | 2 +- .../controller/webb/KdzApiController.java | 21 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java index 72e0cf77f..07efdca9b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java @@ -64,7 +64,7 @@ public class KdzApiServiceImpl implements KdzApiService { .storeBusinessType(Objects.requireNonNull(LicenseTypeEnum.match(licenseTransactDO.getLicenseType())).getMessage()) .storeBusinessValidPeriod(Objects.isNull(licenseTransactDO.getValidity()) ? "9" : DateUtils.dateTime(licenseTransactDO.getValidity())) .storeCode(storeNum) - .storeDirector(licenseTransactDO.getOperator()) + .storeDirector(licenseTransactDO.getLicenseLegalPerson()) .storeFoodLicense(licenseTransactDO.getFoodBusinessLicenseCode()) .storeFoodLicenseBeginDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessStartTime())) .storeFoodLicenseEndDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessEndTime())) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java index 157431756..c62459ae0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.request.AuditResultRequest; import com.cool.store.request.LicenseBizContentRequest; -import com.cool.store.request.SysBuildResultRequest; import com.cool.store.request.XfsgOpenApiRequest; import com.cool.store.response.LicenseApiResponse; import com.cool.store.response.ResponseResult; @@ -33,12 +32,12 @@ public class KdzApiController { public ResponseResult auditResult(@PathVariable(value = "enterprise-id") String eid, @RequestBody XfsgOpenApiRequest request) { log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); - if(!verifyMD5(request,eid)){ - log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid); + if (!verifyMD5(request, eid)) { + log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid); return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); } - if(eid == null || request.getBizContent() == null){ - log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent())); + if (eid == null || request.getBizContent() == null) { + log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent())); return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class); @@ -50,12 +49,12 @@ public class KdzApiController { public ResponseResult license(@PathVariable(value = "enterprise-id") String eid, @RequestBody XfsgOpenApiRequest request) { log.info("license requestBody :{}", JSONObject.toJSONString(request)); - if(!verifyMD5(request,eid)){ - log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid); + if (!verifyMD5(request, eid)) { + log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid); return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); } - if(eid == null || request.getBizContent() == null){ - log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent())); + if (eid == null || request.getBizContent() == null) { + log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent())); return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } LicenseBizContentRequest storeNum = JSONObject.parseObject(request.getBizContent(), LicenseBizContentRequest.class); @@ -63,9 +62,7 @@ public class KdzApiController { } - - - public static boolean verifyMD5(XfsgOpenApiRequest request, String eid){ + public static boolean verifyMD5(XfsgOpenApiRequest request, String eid) { //签名 StringBuffer sb = new StringBuffer(); //用户唯一标识id