From 3f88f7874577d17f1f1c0a59bcbf40df4c66d945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 5 Jun 2024 16:29:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E7=AB=8B=E6=96=B9=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/constants/CommonConstants.java | 2 ++ .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 1 + .../cool/store/service/impl/ApplyLicenseServiceImpl.java | 2 +- .../cool/store/service/impl/OpeningOperationPlanImpl.java | 2 +- .../java/com/cool/store/service/impl/YlfServiceImpl.java | 6 ++++++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 43c06fe65..b621c994b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -28,6 +28,8 @@ public class CommonConstants { //十秒 public static final int TEN_SECONDS = 10000; + public static final int ONE_SECONDS = 1000; + /** * 跟进任务通知缓存时间 1小时 */ diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 65aa2734e..88638d354 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -212,6 +212,7 @@ public enum ErrorCodeEnum { XFSG_SERVICE_ERROR(103099,"鲜丰服务调用失败",null), GET_FIRST_ORDER(103021,"获取鲜丰首批订货金失败",null), YLF_ERROR(110001, "云立方接口异常！异常信息：{0}", null), + YLF_DATA_IS_NULL(110002, "请联系工程维护云立方系统门店信息!", null), //装修 THREE_ACCEPTANCE(121001,"提交三方验收失败",null), CHECK_ITEM(12002,"插入检查项失败",null), 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 01fb80974..939c167fd 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 @@ -97,7 +97,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { String lockKey = "submitLicense:" + request.getShopId(); String lockValue = UUID.randomUUID().toString(); boolean acquired = Boolean.FALSE; - acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS); + acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.ONE_SECONDS); if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index 6a179b932..fe753bbc0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -214,7 +214,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { return Boolean.TRUE; } catch (Exception e) { log.error("获取鲜丰订货金异常或更新状态失败"); - throw new ServiceException(ErrorCodeEnum.YLF_ERROR); + throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java index 2556736cc..87e209fcb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java @@ -53,6 +53,9 @@ public class YlfServiceImpl implements YlfService { return list.get(0); } } catch (Exception e) { + if ("无对应数据！".equals(((ServiceException)e).getErrorMessage())){ + throw new ServiceException(ErrorCodeEnum.YLF_DATA_IS_NULL); + } throw new ServiceException(ErrorCodeEnum.YLF_ERROR,((ServiceException)e).getErrorMessage()); } return null; @@ -95,6 +98,9 @@ public class YlfServiceImpl implements YlfService { } } catch (Exception e) { log.info("调用云立方获取项目列表异常,getProjectList error:{}", e); + if ("无对应数据！".equals(((ServiceException)e).getErrorMessage())){ + throw new ServiceException(ErrorCodeEnum.YLF_DATA_IS_NULL); + } throw new ServiceException(ErrorCodeEnum.YLF_ERROR,((ServiceException)e).getErrorMessage()); }