Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 06eccf50 24f07d55
Showing 3 changed files with 5 additions and 14 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java
@@ -415,11 +415,11 @@ public class CustomerChangeBizService extends AbstractCustomerService {
         BV.isNotEmpty(userList, () -> "更换跟进人员失败：没有更多续保跟进员");
         Collections.shuffle(userList);
         PostUserDTO userDTO = userList.get(0);
-        boolean bool = userDTO.getId().equals(task.getFollowUser()) && userList.size() <= 0;
+        boolean bool = userDTO.getUserId().equals(task.getFollowUser()) && userList.size() <= 0;
         if (bool) {
             return null;
         }
-        if (userDTO.getId().equals(task.getFollowUser())) {
+        if (userDTO.getUserId().equals(task.getFollowUser())) {
             userDTO = userList.get(1);
         }
         return userDTO;
@@ -705,7 +705,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         } else {
             task.setBeginTime(cluePool.getStartTime());
             settingBizService.querySettingByType(cluePool.getClueType(), SettingTypeEnum.CHANGE_TIME, cluePool.getGroupId())
-                    .ifPresent(r -> task.setDeadline(calDate(r, cluePool.getAddTime(), false)));
+                    .ifPresent(r -> task.setDeadline(calDate(r, cluePool.getAddTime(), FollowTypeEnum.IR.equals(cluePool.getClueType()))));
         }
         return task;
     }
@@ -157,16 +157,6 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
                     });
                 }
             }
-            if (SettingTypeEnum.FAIL_TIME.getValue().equals(vo.getType())) {
-                if (Objects.nonNull(unitEnum) && value > 0) {
-                    final int calendarType = getCalendarType(unitEnum);
-                    list.forEach(clue -> {
-                        Date originTime = clue.getAddTime();
-                        Timestamp timestamp = DateUtil.getExpired(originTime, value, calendarType);
-                        clue.setDeadline(timestamp);
-                    });
-                }
-            }
         }
         customerCluePoolService.updateBatchById(list);
     }
@@ -232,12 +222,13 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
         if (Boolean.TRUE.equals(task.getRedistribution())) {
             task.setReason(TaskDefeatTypeEnum.C);
         } else {
-            task.setReason(TaskDefeatTypeEnum.B);
+            task.setReason(TaskDefeatTypeEnum.C);
             final Long clueId = task.getClueId();
             CustomerCluePool cluePool = customerCluePoolService.getById(clueId);
             if (Objects.nonNull(cluePool)) {
                 if (Boolean.FALSE.equals(cluePool.getRedistribution()) &&
                         LocalDateTime.now().isBefore((DateUtil.date2LocalDateTime(cluePool.getDeadline())))) {
+                    task.setReason(TaskDefeatTypeEnum.B);
                     PostUserDTO followUser = customerChangeBizService.changeInsFollowUser(task);
                     if (Objects.isNull(followUser)) {
                         task.setReason(null);