diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java index 01e908e..d2c8e37 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java @@ -160,7 +160,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy { @Transactional(rollbackFor = Exception.class) public boolean origin2task(OriginalData originalData) { Customer customer = customerService.queryById(originalData.getCustomerId()); - if (Objects.isNull(customer)) { + if (Objects.isNull(customer) || Objects.isNull(customer.getAdviserId()) || Objects.isNull(customer.getShopId())) { return true; } if (DataTypeEnum.FM.equals(originalData.getType())) { diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java index d3131b0..3633a44 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java @@ -220,7 +220,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy { @Transactional(rollbackFor = Exception.class) public boolean origin2task(OriginalData originalData) { Customer customer = customerService.queryById(originalData.getCustomerId()); - if (Objects.isNull(customer)) { + if (Objects.isNull(customer) || Objects.isNull(customer.getAdviserId()) || Objects.isNull(customer.getShopId())) { return true; } this.completeTask(customer, originalData.getGenerateTime()); @@ -233,7 +233,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy { List userList = userService.getUserByRole(shopId, RoleCode.XBGJ); if (CollectionUtils.isEmpty(userList)) { - log.error("跟进人员获取失败:没有续保跟进员"); + log.error("跟进人员获取失败:没有续保跟进员 -> shopId:{}", shopId); return false; } task.setOriginUser(userList.get(0).getUserId()); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java index 28edb1d..a93981c 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java @@ -161,7 +161,7 @@ public class RMFollowStrategy extends AbstractFollowStrategy { @Transactional(rollbackFor = Exception.class) public boolean origin2task(OriginalData originalData) { Customer customer = customerService.queryById(originalData.getCustomerId()); - if (Objects.isNull(customer)) { + if (Objects.isNull(customer) || Objects.isNull(customer.getAdviserId()) || Objects.isNull(customer.getShopId())) { return true; } completeTask(customer, originalData.getGenerateTime());