Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

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),
+
+
     ;
 
 

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());

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());

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);