valhalla / fw-valhalla

Commit 1d55d78ad5a82be085b8de3b6d6fbd80c1e13ed7

Authored by 张志伟
2 parents d3202190 12c6f43e

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

Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java
  View file @1d55d78
... ... @@ -160,7 +160,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy {
160 160 @Transactional(rollbackFor = Exception.class)
161 161 public boolean origin2task(OriginalData originalData) {
162 162 Customer customer = customerService.queryById(originalData.getCustomerId());
163   - if (Objects.isNull(customer)) {
  163 + if (Objects.isNull(customer) || Objects.isNull(customer.getAdviserId()) || Objects.isNull(customer.getShopId())) {
164 164 return true;
165 165 }
166 166 if (DataTypeEnum.FM.equals(originalData.getType())) {
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java
  View file @1d55d78
... ... @@ -220,7 +220,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
220 220 @Transactional(rollbackFor = Exception.class)
221 221 public boolean origin2task(OriginalData originalData) {
222 222 Customer customer = customerService.queryById(originalData.getCustomerId());
223   - if (Objects.isNull(customer)) {
  223 + if (Objects.isNull(customer) || Objects.isNull(customer.getAdviserId()) || Objects.isNull(customer.getShopId())) {
224 224 return true;
225 225 }
226 226 this.completeTask(customer, originalData.getGenerateTime());
... ... @@ -233,7 +233,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
233 233 List<PostUserDTO> userList = userService.getUserByRole(shopId, RoleCode.XBGJ);
234 234  
235 235 if (CollectionUtils.isEmpty(userList)) {
236   - log.error("跟进人员获取失败：没有续保跟进员");
  236 + log.error("跟进人员获取失败：没有续保跟进员 -> shopId:{}", shopId);
237 237 return false;
238 238 }
239 239 task.setOriginUser(userList.get(0).getUserId());
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java
  View file @1d55d78
... ... @@ -161,7 +161,7 @@ public class RMFollowStrategy extends AbstractFollowStrategy {
161 161 @Transactional(rollbackFor = Exception.class)
162 162 public boolean origin2task(OriginalData originalData) {
163 163 Customer customer = customerService.queryById(originalData.getCustomerId());
164   - if (Objects.isNull(customer)) {
  164 + if (Objects.isNull(customer) || Objects.isNull(customer.getAdviserId()) || Objects.isNull(customer.getShopId())) {
165 165 return true;
166 166 }
167 167 completeTask(customer, originalData.getGenerateTime());
... ...