From 2889bb0c7e0e981bd0b16834dd9bd7515c5a0b2b Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Wed, 10 Apr 2024 10:52:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E5=8F=B7=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/UserAuthMappingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index b87785b7c..6e3d6c08b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -107,7 +107,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){ // 按工号排序后放入redis authWarRegionUserIdList = authWarRegionUserIdList.stream() - .sorted((a, b) -> a.compareTo(b)) + .sorted((a, b) -> b.compareTo(a)) .collect(Collectors.toList()); redisUtilPool.listPushTail(investmentManagerKey, authWarRegionUserIdList.toArray(new String[authWarRegionUserIdList.size()])); suitableUserId = redisUtilPool.rpopStr(investmentManagerKey); From 83d1ff2d07b379f848bf2e02cb62193f055e0fd0 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 10 Apr 2024 10:59:08 +0800 Subject: [PATCH 2/3] ErrorCodeEnum --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 5 +++++ .../store/service/impl/TrainingExperienceServiceImpl.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) 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 0d2570ee4..9ffd4d810 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 @@ -138,6 +138,11 @@ public enum ErrorCodeEnum { ONLY_WAR_REGION_CONFIG(108002, "意向省市只能配置到战区",null), NOT_APPROVE_NODE(109001, "不是审批节点",null), + + + TIME_FALSE(109002, "结束时间不能早于开始时间",null), + + ; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 2113ea2d7..fccdbc5f6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -58,13 +58,13 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr return Boolean.FALSE; } if (Objects.isNull(request.getLineId())) { - throw new ServiceException(INTERVIEW_LINE_ID_IS_NULL); + throw new ServiceException(ErrorCodeEnum.INTERVIEW_LINE_ID_IS_NULL); } LeaseBaseInfoDO leaseBaseInfoDO = request.toLeaseBaseInfoDO(); Date currentDate = new Date(); LineInfoDO lineInfoDO = new LineInfoDO(); if (request.getExperienceStartTime().compareTo(request.getExperienceEndTime()) >= 0){ - throw new ServiceException("结束时间不能早于开始时间"); + throw new ServiceException(ErrorCodeEnum.TIME_FALSE); } if (currentDate.before(request.getExperienceStartTime())){ leaseBaseInfoDO.setExperienceStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85.getCode()); From c167c1a9f2c1eef3edcb7af7a93464c5fb078092 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Wed, 10 Apr 2024 11:17:46 +0800 Subject: [PATCH 3/3] fillLinePay --- .../java/com/cool/store/service/impl/LinePayServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index 1e268a80d..7e4d76d6e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -91,13 +91,13 @@ public class LinePayServiceImpl implements LinePayService { linePayDO.setPayTime(request.getPayTime()); linePayDO.setPayPic(request.getPayPic()); linePayDO.setPromisePic(request.getPromisePic()); + linePayDO.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); if(isAdd){ linePayDO.setPartnerId(partnerUser.getPartnerId()); linePayDO.setLineId(request.getLineId()); linePayDO.setCreateTime(new Date()); linePayDO.setCreateUserId(partnerUser.getPartnerId()); linePayDO.setDeleted(false); - linePayDO.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); }else { linePayDO.setUpdateTime(new Date()); linePayDO.setUpdateUserId(partnerUser.getPartnerId());