Commit 575a3fa0639b204e93b1024146924be581dcfdc0

Authored by 张志伟
2 parents 06eccf50 24f07d55

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

fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java
... ... @@ -415,11 +415,11 @@ public class CustomerChangeBizService extends AbstractCustomerService {
415 415 BV.isNotEmpty(userList, () -> "更换跟进人员失败:没有更多续保跟进员");
416 416 Collections.shuffle(userList);
417 417 PostUserDTO userDTO = userList.get(0);
418   - boolean bool = userDTO.getId().equals(task.getFollowUser()) && userList.size() <= 0;
  418 + boolean bool = userDTO.getUserId().equals(task.getFollowUser()) && userList.size() <= 0;
419 419 if (bool) {
420 420 return null;
421 421 }
422   - if (userDTO.getId().equals(task.getFollowUser())) {
  422 + if (userDTO.getUserId().equals(task.getFollowUser())) {
423 423 userDTO = userList.get(1);
424 424 }
425 425 return userDTO;
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
... ... @@ -705,7 +705,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
705 705 } else {
706 706 task.setBeginTime(cluePool.getStartTime());
707 707 settingBizService.querySettingByType(cluePool.getClueType(), SettingTypeEnum.CHANGE_TIME, cluePool.getGroupId())
708   - .ifPresent(r -> task.setDeadline(calDate(r, cluePool.getAddTime(), false)));
  708 + .ifPresent(r -> task.setDeadline(calDate(r, cluePool.getAddTime(), FollowTypeEnum.IR.equals(cluePool.getClueType()))));
709 709 }
710 710 return task;
711 711 }
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java
... ... @@ -157,16 +157,6 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
157 157 });
158 158 }
159 159 }
160   - if (SettingTypeEnum.FAIL_TIME.getValue().equals(vo.getType())) {
161   - if (Objects.nonNull(unitEnum) && value > 0) {
162   - final int calendarType = getCalendarType(unitEnum);
163   - list.forEach(clue -> {
164   - Date originTime = clue.getAddTime();
165   - Timestamp timestamp = DateUtil.getExpired(originTime, value, calendarType);
166   - clue.setDeadline(timestamp);
167   - });
168   - }
169   - }
170 160 }
171 161 customerCluePoolService.updateBatchById(list);
172 162 }
... ... @@ -232,12 +222,13 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
232 222 if (Boolean.TRUE.equals(task.getRedistribution())) {
233 223 task.setReason(TaskDefeatTypeEnum.C);
234 224 } else {
235   - task.setReason(TaskDefeatTypeEnum.B);
  225 + task.setReason(TaskDefeatTypeEnum.C);
236 226 final Long clueId = task.getClueId();
237 227 CustomerCluePool cluePool = customerCluePoolService.getById(clueId);
238 228 if (Objects.nonNull(cluePool)) {
239 229 if (Boolean.FALSE.equals(cluePool.getRedistribution()) &&
240 230 LocalDateTime.now().isBefore((DateUtil.date2LocalDateTime(cluePool.getDeadline())))) {
  231 + task.setReason(TaskDefeatTypeEnum.B);
241 232 PostUserDTO followUser = customerChangeBizService.changeInsFollowUser(task);
242 233 if (Objects.isNull(followUser)) {
243 234 task.setReason(null);
... ...