From e6a7537f00b123cdcf9884ed915896e366365a8a Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 14:24:41 +0800 Subject: [PATCH] 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