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

张志伟
2 parents 867c91de 96e03a33
Showing 9 changed files with 67 additions and 12 deletions
fw-shirasawa-dao/src/main/resources/mapper/FollowTaskMapper.xml
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/dto/FollowPoolDTO.java
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/enums/FeedbackTypeEnum.java
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/vo/pool/FollowPoolListVO.java
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/app/PoolController.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/component/FlowConsumer.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/FollowStrategy.java
@@ -16,7 +16,8 @@
         t1.finish_shop finish_shop,
         t1.finish_user_name finish_user_name,
         t1.create_time start_time,
-        t1.times times,
+        t1.deadline deadline,
+        ifnull(t1.times, 0) times,
         t1.feedback feedback,
         TIMESTAMPDIFF(HOUR, now(), t1.deadline) remaining,
         t1.redistribution redistribution,
@@ -41,6 +41,10 @@ public class FollowPoolDTO {
      */
     private LocalDateTime startTime;
     /**
+     * 任务开始时间
+     */
+    private LocalDateTime deadline;
+    /**
      * 跟进次数
      */
     private Integer times;
@@ -19,11 +19,11 @@ public enum FeedbackTypeEnum implements IEnum&lt;Integer&gt; {
     /**
      * 微聊
      */
-    EXPENSIVE(2, "收费高"),
+    EXPENSIVE(2, "价格高"),
     /**
      * 过几天进站
      */
-    WAITING(3, "过几天进站"),
+    WAITING(3, "过几天进店"),
     /**
      * 微信
      */
@@ -2,7 +2,7 @@ package cn.fw.shirasawa.domain.vo.pool;
  
 import lombok.Data;
  
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Objects;
  
 /**
@@ -37,7 +37,11 @@ public class FollowPoolListVO {
     /**
      * 任务开始时间
      */
-    private Date startTime;
+    private LocalDateTime startTime;
+    /**
+     * 任务开始时间
+     */
+    private LocalDateTime deadline;
     /**
      * 剩余天数
      */
@@ -65,7 +69,7 @@ public class FollowPoolListVO {
     /**
      * 关单时间
      */
-    private Date closeTime;
+    private LocalDateTime closeTime;
     /**
      * 战败类型
      */
@@ -74,6 +78,10 @@ public class FollowPoolListVO {
      * 集团id
      */
     private Long groupId;
+    /**
+     * 跟进次数
+     */
+    private Integer times;
  
     public String getRemaining() {
         if (Objects.isNull(remaining) || state != 1) {
@@ -13,6 +13,7 @@ import cn.fw.shirasawa.domain.query.FollowPoolQueryVO;
 import cn.fw.shirasawa.domain.query.SecretReportHistoryQuery;
 import cn.fw.shirasawa.domain.vo.SecretReportHistoryVO;
 import cn.fw.shirasawa.domain.vo.follow.FollowDetailVO;
+import cn.fw.shirasawa.domain.vo.follow.FollowRecordHistoryVO;
 import cn.fw.shirasawa.domain.vo.pool.CluePoolVO;
 import cn.fw.shirasawa.domain.vo.pool.FollowPoolListVO;
 import cn.fw.shirasawa.service.bus.follow.FollowBizService;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
  
 import javax.validation.constraints.NotNull;
+import java.util.List;
  
 import static cn.fw.common.web.util.ResultBuilder.success;
  
@@ -68,6 +70,13 @@ public class PoolController {
         return success(followBizService.followPoolDetail(taskId));
     }
  
+    @GetMapping("/follow/record/history")
+    @IgnoreAuth
+    @ControllerMethod("查询跟进待办历史记录")
+    public Message<List<FollowRecordHistoryVO>> todoRecordHistory(@NotNull(message = "跟进池id不能为空") final Long taskId) {
+        return success(followBizService.todoHistoryTask(taskId));
+    }
+
  
     @GetMapping("/clue/list")
     @IgnoreAuth
@@ -5,6 +5,7 @@ import cn.fw.flow.result.ApproveCheckMessageDto;
 import cn.fw.shirasawa.domain.db.ApproveRecord;
 import cn.fw.shirasawa.domain.db.follow.FollowTask;
 import cn.fw.shirasawa.domain.enums.ApproveStateEnum;
+import cn.fw.shirasawa.domain.enums.TaskDefeatTypeEnum;
 import cn.fw.shirasawa.domain.enums.TaskStateEnum;
 import cn.fw.shirasawa.service.data.ApproveRecordService;
 import cn.fw.shirasawa.service.data.FollowTaskService;
@@ -18,6 +19,7 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
+import java.time.LocalDateTime;
 import java.util.Objects;
  
 /**
@@ -72,6 +74,8 @@ public class FlowConsumer implements RocketMQListener&lt;ApproveCheckMessageDto&gt; {
         if (Objects.isNull(task) || !TaskStateEnum.ONGOING.equals(task.getState())) {
             return;
         }
+        task.setCloseTime(LocalDateTime.now());
+        task.setReason(TaskDefeatTypeEnum.A);
         StopTaskEvent stopTaskEvent = new StopTaskEvent(task);
         eventPublisher.publishEvent(stopTaskEvent);
     }
@@ -349,11 +349,27 @@ public class FollowBizService {
      * @return 跟进详情
      */
     public List<FollowRecordHistoryVO> todoRecordHistory(Long recordId) {
+        BV.notNull(recordId, () -> "跟进记录id不能为空");
         FollowRecord followRecord = followRecordService.getById(recordId);
         BV.notNull(followRecord, () -> "跟进待办不存在");
         FollowTypeEnum type = followRecord.getType();
         FollowStrategy strategy = followMap.get(type);
-        return strategy.queryRecordHistory(followRecord);
+        return strategy.queryHistoryByRecord(followRecord);
+    }
+
+    /**
+     * 查询跟进详情
+     *
+     * @param taskId 跟进任务id
+     * @return 跟进详情
+     */
+    public List<FollowRecordHistoryVO> todoHistoryTask(Long taskId) {
+        BV.notNull(taskId, () -> "跟进任务id不能为空");
+        FollowTask task = followTaskService.getById(taskId);
+        BV.notNull(task, () -> "跟进任务不存在");
+        FollowTypeEnum type = task.getType();
+        FollowStrategy strategy = followMap.get(type);
+        return strategy.queryHistoryByTask(task);
     }
  
     /**
@@ -226,14 +226,19 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
     }
  
     @Override
-    public List<FollowRecordHistoryVO> queryRecordHistory(FollowRecord record) {
-        List<FollowRecord> followRecordList = new ArrayList<>();
+    public List<FollowRecordHistoryVO> queryHistoryByRecord(FollowRecord record) {
         FollowTask task = followTaskService.getById(record.getTaskId());
+        return queryHistoryByTask(task);
+    }
+
+    @Override
+    public List<FollowRecordHistoryVO> queryHistoryByTask(FollowTask task) {
+        List<FollowRecord> followRecordList = new ArrayList<>();
         if (Objects.nonNull(task)) {
             Long clueId = task.getClueId();
             List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery()
                     .eq(FollowTask::getClueId, clueId)
-                    .ne(FollowTask::getId, record.getTaskId())
+                    .ne(FollowTask::getId, task.getId())
             );
             if (!CollectionUtils.isEmpty(taskList)) {
                 for (FollowTask followTask : taskList) {
@@ -244,7 +249,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
                 }
             }
         }
-        List<FollowRecord> recordList = followRecordService.getRecordList(record.getTaskId());
+        List<FollowRecord> recordList = followRecordService.getRecordList(task.getId());
         if (!CollectionUtils.isEmpty(recordList)) {
             followRecordList.addAll(recordList);
         }
@@ -128,7 +128,15 @@ public interface FollowStrategy {
      * @param record
      * @return
      */
-    List<FollowRecordHistoryVO> queryRecordHistory(FollowRecord record);
+    List<FollowRecordHistoryVO> queryHistoryByRecord(FollowRecord record);
+
+    /**
+     * 查询跟进记录
+     *
+     * @param task
+     * @return
+     */
+    List<FollowRecordHistoryVO> queryHistoryByTask(FollowTask task);
  
     /**
      * 上传跟进附件