修复档案不存在的时候跟进列表报错

张志伟
1 parent 5588019f
Showing 4 changed files with 23 additions and 6 deletions
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/FMFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java
@@ -794,6 +794,13 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         followTaskService.updateById(task);
     }
+    protected void onCustomerIsNil(FollowRecord record) {
+        BackLogItemDTO dto = new BackLogItemDTO(record.getUserId(), getItemCode(record.getType()), String.valueOf(record.getId()), new Date(), record.getShopId());
+        todoRpcService.complete(dto);
+        record.setFollowTime(new Date());
+        followRecordService.updateById(record);
+    }
+
     private void onStopClue(CustomerCluePool clue, TaskDefeatTypeEnum defeatTypeEnum) {
         clue.setClueStatus(ClueStatusEnum.FAILURE);
         clue.setCloseTime(new Date());
@@ -55,12 +55,14 @@ public class FMFollowStrategy extends AbstractFollowStrategy {
             vo.setCustomerId(followRecord.getCustomerId());
             vo.setDeadline(followRecord.getDeadline());
             CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId());
-            if (Objects.nonNull(customerDetailDto)) {
-                vo.setName(customerDetailDto.getName());
-                vo.setPlateNo(customerDetailDto.getPlateNo());
-                vo.setCarImage(customerDetailDto.getCarImage());
-                vo.setBuyDate(customerDetailDto.getBuyDate());
+            if (Objects.isNull(customerDetailDto)) {
+                onCustomerIsNil(followRecord);
+                continue;
             }
+            vo.setName(customerDetailDto.getName());
+            vo.setPlateNo(customerDetailDto.getPlateNo());
+            vo.setCarImage(customerDetailDto.getCarImage());
+            vo.setBuyDate(customerDetailDto.getBuyDate());
             Optional<FollowTask> followTask = Optional.ofNullable(followTaskService.getById(followRecord.getTaskId()));
             followTask.ifPresent(task -> vo.setFMExpiration(task.getDeadline()));
             voList.add(vo);
@@ -17,6 +17,7 @@ import cn.fw.valhalla.domain.enums.*;
 import cn.fw.valhalla.domain.vo.follow.*;
 import cn.fw.valhalla.domain.vo.setting.SettingVO;
 import cn.fw.valhalla.rpc.angel.dto.InsuranceDTO;
+import cn.fw.valhalla.rpc.erp.dto.BackLogItemDTO;
 import cn.fw.valhalla.rpc.erp.dto.PostUserDTO;
 import cn.fw.valhalla.rpc.erp.dto.UserInfoDTO;
 import cn.fw.valhalla.rpc.oop.dto.ShopDTO;
@@ -64,6 +65,10 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
             vo.setCustomerId(followRecord.getCustomerId());
             vo.setDeadline(followRecord.getDeadline());
             CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId());
+            if (Objects.isNull(customerDetailDto)) {
+                onCustomerIsNil(followRecord);
+                continue;
+            }
             vo.setName(customerDetailDto.getName());
             vo.setCarImage(customerDetailDto.getCarImage());
             vo.setPlateNo(customerDetailDto.getPlateNo());
@@ -76,11 +76,14 @@ public class RMFollowStrategy extends AbstractFollowStrategy {
             vo.setCustomerId(followRecord.getCustomerId());
             vo.setDeadline(followRecord.getDeadline());
             CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId());
+            if (Objects.isNull(customerDetailDto)) {
+                onCustomerIsNil(followRecord);
+                continue;
+            }
             vo.setName(customerDetailDto.getName());
             vo.setCarImage(customerDetailDto.getCarImage());
             vo.setPlateNo(customerDetailDto.getPlateNo());
             vo.setLastMileage(customerDetailDto.getCurrentMileage());
-
             OriginalData originalData = originalDataService.getOne(Wrappers.<OriginalData>lambdaQuery()
                     .eq(OriginalData::getCustomerId, followRecord.getCustomerId())
                     .eq(OriginalData::getType, DataTypeEnum.FS)