新增接车时作废档案后结束跟进任务等数据的逻辑

张志伟
1 parent c232dfda
Showing 12 changed files with 120 additions and 54 deletions
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/CustomerApiServiceImpl.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomEventListener.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
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/FollowBizService.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/FollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.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
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/event/PublicPoolEvent.java
@@ -73,7 +73,7 @@ public class CustomerApiServiceImpl implements CustomerApiService {
         final String msg = "查询保有客档案[queryById]";
         log.info("{}: param[{}]", msg, customerId);
         try {
-            CustomerDetailDto detailDto = customerBiz.queryById(customerId, Boolean.FALSE);
+            CustomerDetailDto detailDto = customerBiz.queryById(customerId);
             if (Objects.isNull(detailDto)) {
                 log.info("{} 成功: 查无此档案", msg);
                 return success();
@@ -79,7 +79,12 @@ public class CustomEventListener {
     @EventListener(PublicPoolEvent.class)
     public void stopTaskAndAddPublic(final PublicPoolEvent event) {
         Long getCustomerId = event.getCustomerId();
-        followBizService.stopTask(getCustomerId, event.getGroupId());
+        Boolean forbidden = event.getForbidden();
+        if (Boolean.TRUE.equals(forbidden)) {
+            followBizService.onForbidden(getCustomerId, event.getGroupId());
+        } else {
+            followBizService.stopTask(getCustomerId, event.getGroupId());
+        }
     }
     /**
@@ -95,6 +100,7 @@ public class CustomEventListener {
     /**
      * 取消审批
+     *
      * @param event
      */
     @EventListener(CancelApproveEvent.class)
@@ -107,7 +113,7 @@ public class CustomEventListener {
                 .eq(ApproveRecord::getState, ApproveStateEnum.WAIT)
                 .last("limit 1")
         );
-        if  (Objects.isNull(approveRecord)) {
+        if (Objects.isNull(approveRecord)) {
             return;
         }
         //FIXME 优化项 处理审批取消失败的场景
@@ -118,6 +124,7 @@ public class CustomEventListener {
     /**
      * 档案专属顾问发生改变后
+     *
      * @param event
      */
     @EventListener(CustomerDefeatedEvent.class)
@@ -96,7 +96,7 @@ public class CustomerBizService extends AbstractCustomerService {
      * @return
      */
     public CustomerDetailVO getDetailById(final Long cusId) {
-        CustomerDetailDto detailDto = queryById(cusId, Boolean.FALSE);
+        CustomerDetailDto detailDto = queryById(cusId);
         BV.notNull(detailDto, () -> "查无此档案");
         BV.isTrue(detailDto.getYn(), () -> "此档案已经作废，无法再继续查看");
         CustomerDetailVO vo = new CustomerDetailVO();
@@ -297,13 +297,8 @@ public class CustomerBizService extends AbstractCustomerService {
      * @param cusId
      * @return
      */
-    public CustomerDetailDto queryById(final Long cusId, final Boolean needInvalid) {
-        Customer customer;
-        if (Boolean.TRUE.equals(needInvalid)) {
-            customer = customerService.queryByIdWithInvalid(cusId);
-        } else {
-            customer = customerService.queryById(cusId);
-        }
+    public CustomerDetailDto queryById(final Long cusId) {
+        Customer customer = customerService.queryById(cusId);
         if (Objects.isNull(customer)) {
             return null;
         }
@@ -341,7 +336,7 @@ public class CustomerBizService extends AbstractCustomerService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void abandon(final Long customerId, final String reason) {
-        CustomerDetailDto detailDto = queryById(customerId, Boolean.FALSE);
+        CustomerDetailDto detailDto = queryById(customerId);
         BV.notNull(detailDto, () -> "档案不存在");
         if (publicPoolService.queryByPlate(detailDto.getPlateNo(), detailDto.getGroupId()).isPresent()) {
             return;
@@ -359,7 +354,7 @@ public class CustomerBizService extends AbstractCustomerService {
         affiliationRecordService.save(entity);
         publicPoolService.save(publicPool);
         stammkundePoolService.reject(customerId, detailDto.getGroupId(), DefeatReasonEnum.GU);
-        PublicPoolEvent poolEvent = new PublicPoolEvent(customerId, detailDto.getGroupId());
+        PublicPoolEvent poolEvent = new PublicPoolEvent(customerId, detailDto.getGroupId(), false);
         eventPublisher.publishEvent(poolEvent);
     }
@@ -370,7 +365,7 @@ public class CustomerBizService extends AbstractCustomerService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void abandon(final FollowTask task, boolean flow) {
-        CustomerDetailDto detailDto = queryById(task.getCustomerId(), Boolean.FALSE);
+        CustomerDetailDto detailDto = queryById(task.getCustomerId());
         if (Objects.isNull(detailDto)) {
             return;
         }
@@ -409,7 +404,7 @@ public class CustomerBizService extends AbstractCustomerService {
         publicPoolService.save(publicPool);
         stammkundePoolService.reject(task.getCustomerId(), task.getGroupId(), reasonEnum);
-        PublicPoolEvent poolEvent = new PublicPoolEvent(task.getCustomerId(), task.getGroupId());
+        PublicPoolEvent poolEvent = new PublicPoolEvent(task.getCustomerId(), task.getGroupId(), false);
         eventPublisher.publishEvent(poolEvent);
     }
@@ -40,6 +40,7 @@ import cn.fw.valhalla.sdk.enums.ReasonEnum;
 import cn.fw.valhalla.sdk.param.ChangeAdviserReq;
 import cn.fw.valhalla.service.data.*;
 import cn.fw.valhalla.service.event.CustomerDefeatedEvent;
+import cn.fw.valhalla.service.event.PublicPoolEvent;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
@@ -205,6 +206,8 @@ public class CustomerChangeBizService extends AbstractCustomerService {
                 if (!bool) {
                     stammkundePoolService.reject(saveDto.getId(), saveDto.getGroupId(), DefeatReasonEnum.CI);
                     customerService.forbidden(saveDto.getMotoId());
+                    PublicPoolEvent poolEvent = new PublicPoolEvent(saveDto.getMotoId(), saveDto.getGroupId(), true);
+                    eventPublisher.publishEvent(poolEvent);
                 }
                 Customer customer = customerService.queryById(saveDto.getId());
                 BV.notNull(customer, "档案信息异常");
@@ -218,6 +221,8 @@ public class CustomerChangeBizService extends AbstractCustomerService {
             } else {
                 stammkundePoolService.reject(saveDto.getId(), saveDto.getGroupId(), DefeatReasonEnum.CI);
                 customerService.forbidden(saveDto.getMotoId());
+                PublicPoolEvent poolEvent = new PublicPoolEvent(saveDto.getMotoId(), saveDto.getGroupId(), true);
+                eventPublisher.publishEvent(poolEvent);
                 Customer customer = new Customer();
                 BeanUtils.copyProperties(saveDto, customer);
                 customer.setUseType(CarUseTypeEnum.ofValue(saveDto.getUseType()));
@@ -229,6 +234,8 @@ public class CustomerChangeBizService extends AbstractCustomerService {
             if (Objects.nonNull(saveDto.getId())) {
                 stammkundePoolService.reject(saveDto.getId(), saveDto.getGroupId(), DefeatReasonEnum.CI);
                 customerService.forbidden(saveDto.getId());
+                PublicPoolEvent poolEvent = new PublicPoolEvent(saveDto.getMotoId(), saveDto.getGroupId(), true);
+                eventPublisher.publishEvent(poolEvent);
                 saveDto.setId(null);
             }
             Customer customer = new Customer();
@@ -400,23 +400,62 @@ public class FollowBizService {
     @Transactional(rollbackFor = Exception.class)
     public void stopTask(Long customerId, Long groupId) {
         List<FollowTypeEnum> typeList = Arrays.asList(FollowTypeEnum.FM, FollowTypeEnum.RM);
-        List<ClueStatusEnum> statusList = Arrays.asList(ClueStatusEnum.WAITING, ClueStatusEnum.ONGOING);
         List<CustomerCluePool> cluePoolList = customerCluePoolService.list(Wrappers.<CustomerCluePool>lambdaQuery()
-                .in(CustomerCluePool::getClueStatus, statusList)
+                .eq(CustomerCluePool::getClueStatus, ClueStatusEnum.ONGOING)
                 .in(CustomerCluePool::getClueType, typeList)
                 .eq(CustomerCluePool::getRefererId, customerId)
                 .eq(CustomerCluePool::getGroupId, groupId)
         );
-        if (CollectionUtils.isEmpty(cluePoolList)) {
+        if (!CollectionUtils.isEmpty(cluePoolList)) {
+            for (CustomerCluePool clue : cluePoolList) {
+                FollowStrategy strategy = followMap.get(clue.getClueType());
+                if (Objects.nonNull(strategy)) {
+                    strategy.forceStopClue(clue);
+                }
+            }
+            customerCluePoolService.updateBatchById(cluePoolList);
+        }
+        List<CustomerCluePool> cluePoolWaitList = customerCluePoolService.list(Wrappers.<CustomerCluePool>lambdaQuery()
+                .eq(CustomerCluePool::getClueStatus, ClueStatusEnum.WAITING)
+                .in(CustomerCluePool::getClueType, typeList)
+                .eq(CustomerCluePool::getRefererId, customerId)
+                .eq(CustomerCluePool::getGroupId, groupId)
+        );
+
+        if (CollectionUtils.isEmpty(cluePoolWaitList)) {
             return;
         }
-        for (CustomerCluePool clue : cluePoolList) {
-            FollowStrategy strategy = followMap.get(clue.getClueType());
-            if (Objects.nonNull(strategy)) {
-                strategy.forceStopClue(clue);
+        customerCluePoolService.removeByIds(cluePoolWaitList);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void onForbidden(Long customerId, Long groupId) {
+        List<FollowTypeEnum> typeList = Arrays.asList(FollowTypeEnum.FM, FollowTypeEnum.RM, FollowTypeEnum.IR);
+        List<CustomerCluePool> cluePoolList = customerCluePoolService.list(Wrappers.<CustomerCluePool>lambdaQuery()
+                .eq(CustomerCluePool::getClueStatus, ClueStatusEnum.ONGOING)
+                .in(CustomerCluePool::getClueType, typeList)
+                .eq(CustomerCluePool::getRefererId, customerId)
+                .eq(CustomerCluePool::getGroupId, groupId)
+        );
+        if (!CollectionUtils.isEmpty(cluePoolList)) {
+            for (CustomerCluePool clue : cluePoolList) {
+                FollowStrategy strategy = followMap.get(clue.getClueType());
+                if (Objects.nonNull(strategy)) {
+                    strategy.onForbiddenStopClue(clue);
+                }
             }
         }
         customerCluePoolService.updateBatchById(cluePoolList);
+        List<CustomerCluePool> cluePoolWaitList = customerCluePoolService.list(Wrappers.<CustomerCluePool>lambdaQuery()
+                .eq(CustomerCluePool::getClueStatus, ClueStatusEnum.WAITING)
+                .in(CustomerCluePool::getClueType, typeList)
+                .eq(CustomerCluePool::getRefererId, customerId)
+                .eq(CustomerCluePool::getGroupId, groupId)
+        );
+
+        if (!CollectionUtils.isEmpty(cluePoolWaitList)) {
+            customerCluePoolService.removeByIds(cluePoolWaitList);
+        }
     }
     /**
@@ -635,32 +635,13 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void forceStopClue(CustomerCluePool clue) {
-        clue.setClueStatus(ClueStatusEnum.FAILURE);
-        clue.setCloseTime(new Date());
-        FollowTask task = followTaskService.queryOngoingTaskByClueId(clue.getId());
-        if (Objects.isNull(task)) {
-            return;
-        }
-        task.setState(TaskStateEnum.DEFEAT);
-        task.setCloseTime(new Date());
-        task.setReason(TaskDefeatTypeEnum.A);
-        followTaskService.updateById(task);
+        onStopClue(clue, TaskDefeatTypeEnum.A);
+    }
-        List<FollowRecord> recordList = followRecordService.list(Wrappers.<FollowRecord>lambdaQuery()
-                .eq(FollowRecord::getTaskId, task.getId())
-                .eq(FollowRecord::getCustomerId, clue.getRefererId())
-                .eq(FollowRecord::getOutTime, Boolean.FALSE)
-                .isNull(FollowRecord::getFollowTime)
-        );
-        if (!CollectionUtils.isEmpty(recordList)) {
-            for (FollowRecord record : recordList) {
-                if (Boolean.TRUE.equals(record.getAddTodo())) {
-                    completeRecordAndEnd(record);
-                } else {
-                    followRecordService.removeById(record.getId());
-                }
-            }
-        }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void onForbiddenStopClue(CustomerCluePool clue) {
+        onStopClue(clue, TaskDefeatTypeEnum.E);
     }
     @Transactional(rollbackFor = Exception.class)
@@ -806,6 +787,35 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         followTaskService.updateById(task);
     }
+    private void onStopClue(CustomerCluePool clue, TaskDefeatTypeEnum defeatTypeEnum) {
+        clue.setClueStatus(ClueStatusEnum.FAILURE);
+        clue.setCloseTime(new Date());
+        FollowTask task = followTaskService.queryOngoingTaskByClueId(clue.getId());
+        if (Objects.isNull(task)) {
+            return;
+        }
+        task.setState(TaskStateEnum.DEFEAT);
+        task.setCloseTime(new Date());
+        task.setReason(defeatTypeEnum);
+        followTaskService.updateById(task);
+
+        List<FollowRecord> recordList = followRecordService.list(Wrappers.<FollowRecord>lambdaQuery()
+                .eq(FollowRecord::getTaskId, task.getId())
+                .eq(FollowRecord::getCustomerId, clue.getRefererId())
+                .eq(FollowRecord::getOutTime, Boolean.FALSE)
+                .isNull(FollowRecord::getFollowTime)
+        );
+        if (!CollectionUtils.isEmpty(recordList)) {
+            for (FollowRecord record : recordList) {
+                if (Boolean.TRUE.equals(record.getAddTodo())) {
+                    completeRecordAndEnd(record);
+                } else {
+                    followRecordService.removeById(record.getId());
+                }
+            }
+        }
+    }
+
     /**
      * 生成新的跟进
      *
@@ -137,6 +137,13 @@ public interface FollowStrategy {
     void forceStopClue(CustomerCluePool clue);
     /**
+     * 当档案作废是强制结束任务
+     *
+     * @param clue
+     */
+    void onForbiddenStopClue(CustomerCluePool clue);
+
+    /**
      * 更新跟进任务
      *
      * @param customerId
@@ -303,7 +303,7 @@ public class ACFollowStrategy extends AbstractFollowStrategy {
         vo.setPlateNo(accidentPool.getPlateNo());
         vo.setCarModel(getStrWithDefault(accidentPool.getBrandName(), "") + " " + getStrWithDefault(accidentPool.getSeriesName(), ""));
         if (Objects.nonNull(customer)) {
-            CustomerDetailDto customerDetailDto = customerBizService.queryById(customer.getId(), Boolean.TRUE);
+            CustomerDetailDto customerDetailDto = customerBizService.queryById(customer.getId());
             vo.setCustomerId(customer.getId());
             vo.setAdviserId(customerDetailDto.getAdviserId());
             vo.setAdviserName(customerDetailDto.getAdviserName());
@@ -52,7 +52,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy {
             vo.setTaskId(followRecord.getTaskId());
             vo.setCustomerId(followRecord.getCustomerId());
             vo.setDeadline(followRecord.getDeadline());
-            CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId(), Boolean.FALSE);
+            CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId());
             if (Objects.nonNull(customerDetailDto)) {
                 vo.setName(customerDetailDto.getName());
                 vo.setPlateNo(customerDetailDto.getPlateNo());
@@ -174,7 +174,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy {
     @Override
     public FMDetailVO assemble(Long customerId) {
-        CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId, Boolean.TRUE);
+        CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId);
         FMDetailVO vo = new FMDetailVO();
         vo.setVin(customerDetailDto.getFrameNo());
         vo.setCustomerId(customerId);
@@ -62,7 +62,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
             vo.setTaskId(followRecord.getTaskId());
             vo.setCustomerId(followRecord.getCustomerId());
             vo.setDeadline(followRecord.getDeadline());
-            CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId(), Boolean.TRUE);
+            CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId());
             vo.setName(customerDetailDto.getName());
             vo.setCarImage(customerDetailDto.getCarImage());
             vo.setPlateNo(customerDetailDto.getPlateNo());
@@ -407,7 +407,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
     @Override
     public IRDetailVO assemble(Long customerId) {
-        CustomerDetailDto detailDto = customerBizService.queryById(customerId, Boolean.TRUE);
+        CustomerDetailDto detailDto = customerBizService.queryById(customerId);
         IRDetailVO vo = new IRDetailVO();
         vo.setCustomerId(customerId);
         vo.setAdviserId(detailDto.getAdviserId());
@@ -73,7 +73,7 @@ public class RMFollowStrategy extends AbstractFollowStrategy {
             vo.setTaskId(followRecord.getTaskId());
             vo.setCustomerId(followRecord.getCustomerId());
             vo.setDeadline(followRecord.getDeadline());
-            CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId(), Boolean.TRUE);
+            CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId());
             vo.setName(customerDetailDto.getName());
             vo.setCarImage(customerDetailDto.getCarImage());
             vo.setPlateNo(customerDetailDto.getPlateNo());
@@ -237,7 +237,7 @@ public class RMFollowStrategy extends AbstractFollowStrategy {
     @Override
     public RMDetailVO assemble(Long customerId) {
-        CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId, Boolean.TRUE);
+        CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId);
         RMDetailVO vo = new RMDetailVO();
         vo.setCustomerId(customerId);
         vo.setName(customerDetailDto.getName());
@@ -14,4 +14,5 @@ import lombok.Data;
 public class PublicPoolEvent {
     private Long customerId;
     private Long groupId;
+    private Boolean forbidden;
 }