feat(*): 新增查询某个档案的全部跟进记录

- 新增查询某个档案的全部跟进记录

feat(*): 新增查询某个档案的全部跟进记录
- 新增查询某个档案的全部跟进记录
张志伟
1 parent efe55351
Showing 9 changed files with 127 additions and 6 deletions
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/enums/FollowTypeEnum.java
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/vo/follow/MADetailVO.java
fw-shirasawa-sdk/pom.xml
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/enums/DataTypeEnum.java
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/app/FollowQueryController.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/FollowBizService.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/impl/MAFollowStrategy.java
pom.xml
@@ -27,6 +27,7 @@ public enum FollowTypeEnum implements IEnum&lt;Integer&gt; {
     PL(10, "公共池跟进"),
     SF(11, "补贴跟进"),
     RC(12, "区域线索"),
+    MA(13, "市场行动"),
     /**
      * 其他
      * 目前只用于设置，并不参与具体跟进业务
+package cn.fw.shirasawa.domain.vo.follow;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author : kurisu
+ * @className : ACDetailVO
+ * @description : 事故车跟进详情
+ * @date: 2020-08-17 15:17
+ */
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class MADetailVO extends FollowDetailVO {
+    /**
+     * 车牌号
+     */
+    private String plateNo;
+    /**
+     * 专属顾问
+     */
+    private String adviserName;
+    /**
+     * 购车日期
+     */
+    private LocalDateTime buyDate;
+}
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>fw-shirasawa-sdk</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <packaging>jar</packaging>
     <name>fw-shirasawa-sdk</name>
  
@@ -26,6 +26,7 @@ public enum DataTypeEnum {
     PL(10, "售后公共池"),
     SF(11, "补贴跟进"),
     RC(12, "区域线索"),
+    MA(13, "市场行动"),
     ;
  
     /**
@@ -168,8 +168,11 @@ public class FollowQueryController {
     @GetMapping("/customer/history/record")
     @IgnoreAuth
     @ControllerMethod("查询客户的跟进历史记录")
-    public Message<List<FollowRecordHistoryVO>> customerRecord(@NotNull(message = "档案id不能为空") final Long customerId, @NotNull(message = "业态类型不能为空") final Integer bizType) {
-        return success(followBizService.queryHistoryByCustomer(customerId, bizType));
+    public Message<List<FollowRecordHistoryVO>> customerRecord(@NotNull(message = "档案id不能为空") final Long customerId,
+                                                               @NotNull(message = "业态类型不能为空") final Integer bizType,
+                                                               final Integer type
+    ) {
+        return success(followBizService.queryHistoryByCustomer(customerId, bizType,  type));
     }
  
     /**
@@ -762,14 +762,17 @@ public class FollowBizService {
      *
      * @param customerId 客户档案用户id
      * @param bizType    业态类型
+     * @param type       跟进类型
      */
-    public List<FollowRecordHistoryVO> queryHistoryByCustomer(Long customerId, Integer bizType) {
+    public List<FollowRecordHistoryVO> queryHistoryByCustomer(Long customerId, Integer bizType, Integer type) {
+        FollowTypeEnum typeEnum = FollowTypeEnum.ofValue(type);
         List<FollowRecord> followRecordList = followRecordService.list(Wrappers.<FollowRecord>lambdaQuery()
                 .eq(FollowRecord::getCustomerId, customerId)
                 .eq(FollowRecord::getBizType, bizType)
                 .eq(FollowRecord::getFollowStatus, FollowStatusEnum.CLOSED)
                 .eq(FollowRecord::getYn, Boolean.TRUE)
                 .eq(FollowRecord::getAddTodo, Boolean.TRUE)
+                .eq(Objects.nonNull(typeEnum), FollowRecord::getType, typeEnum)
         );
         if (CollectionUtils.isEmpty(followRecordList)) {
             return new ArrayList<>();
@@ -116,7 +116,11 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
             } else if (BizTypeEnum.PS.equals(task.getBizType())) {
                 assembleCompleteTelStatus(record, task);
             } else {
-                record.setCompelTel(ValidationUtils.checkMobile(record.getContacts()));
+                if (FollowTypeEnum.AF.equals(task.getType())) {
+                    record.setCompelTel(Boolean.FALSE);
+                } else {
+                    record.setCompelTel(ValidationUtils.checkMobile(record.getContacts()));
+                }
             }
             if (StringUtils.isEmpty(record.getContacts())) {
                 record.setContacts(originalData.getContacts());
+package cn.fw.shirasawa.service.bus.follow.strategy.impl;
+
+import cn.fw.shirasawa.common.utils.DateUtil;
+import cn.fw.shirasawa.domain.db.follow.FollowRecord;
+import cn.fw.shirasawa.domain.db.follow.FollowTask;
+import cn.fw.shirasawa.domain.enums.FollowTypeEnum;
+import cn.fw.shirasawa.domain.vo.follow.MADetailVO;
+import cn.fw.shirasawa.rpc.valhalla.ValhallaRpcService;
+import cn.fw.shirasawa.rpc.valhalla.dto.ValhallaCustomerDTO;
+import cn.fw.shirasawa.service.bus.follow.strategy.AbstractFollowStrategy;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+import static cn.fw.common.businessvalidator.Validator.BV;
+
+/**
+ * @author : kurisu
+ * @className : MAFollowStrategy
+ * @description : 市场行动策略
+ * @date: 2020-08-17 10:48
+ */
+@Slf4j
+@Component
+public class MAFollowStrategy extends AbstractFollowStrategy {
+
+    private final ValhallaRpcService valhallaRpcService;
+
+    @Autowired
+    public MAFollowStrategy(final ValhallaRpcService valhallaRpcService) {
+        this.valhallaRpcService = valhallaRpcService;
+    }
+
+    @Override
+    public FollowTypeEnum getFollowType() {
+        return FollowTypeEnum.MA;
+    }
+
+    @Override
+    public MADetailVO queryDetail(FollowRecord record) {
+        FollowTask followTask = followTaskService.getById(record.getTaskId());
+        BV.notNull(followTask, "跟进任务不存在");
+        MADetailVO vo = new MADetailVO();
+        assembleRecordDetail(vo, record, followTask);
+        vo.setTaskDeadline(followTask.getDeadline());
+        ValhallaCustomerDTO dto = valhallaRpcService.queryByVin(record.getVin(), record.getGroupId());
+        if (Objects.nonNull(dto)) {
+            vo.setCustomerId(dto.getId());
+            vo.setPlateNo(dto.getPlateNo());
+            vo.setAdviserName(dto.getAdviserName());
+            vo.setBuyDate(DateUtil.date2LocalDateTime(dto.getBuyDate()));
+        }
+        vo.setVin(followTask.getVin());
+        return vo;
+    }
+
+    @Override
+    public MADetailVO followPoolDetail(FollowTask task) {
+        MADetailVO vo = new MADetailVO();
+        vo.setCustomerId(task.getCustomerId());
+        vo.setCustomerName(task.getCustomerName());
+        vo.setPlateNo(task.getPlateNo());
+        vo.setVin(task.getVin());
+        vo.setType(task.getType().getValue());
+        vo.setBizType(task.getBizType().getValue());
+        vo.setTaskId(task.getId());
+        vo.setDeadline(task.getDeadline());
+        vo.setTimes(task.getTimes());
+        ValhallaCustomerDTO dto = valhallaRpcService.queryByVin(task.getVin(), task.getGroupId());
+        if (Objects.nonNull(dto)) {
+            vo.setCustomerId(dto.getId());
+            vo.setCustomerName(dto.getName());
+        }
+        return vo;
+    }
+}
@@ -28,7 +28,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <fw.shirasawa.sdk>1.1.2</fw.shirasawa.sdk>
+        <fw.shirasawa.sdk>1.1.3</fw.shirasawa.sdk>
         <!-- util -->
         <spring-retry.version>1.2.4.RELEASE</spring-retry.version>
         <!-- database -->