feature(*): 升级依赖

- 升级依赖引入kotlin支持 - 新增补贴跟进类型

feature(*): 升级依赖
- 升级依赖引入kotlin支持 - 新增补贴跟进类型
张志伟
1 parent 844f64a3
Showing 11 changed files with 103 additions and 3 deletions
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/enums/FollowTypeEnum.java
fw-shirasawa-sdk/pom.xml
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/enums/DataTypeEnum.java
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/param/FollowGenerateDTO.java
fw-shirasawa-server/src/main/resources/application-gray.yml
fw-shirasawa-server/src/main/resources/application-prd.yml
fw-shirasawa-server/src/main/resources/application-test.yml
fw-shirasawa-server/src/main/resources/application.yml
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/SFFollowStrategy.java
pom.xml
@@ -25,6 +25,7 @@ public enum FollowTypeEnum implements IEnum&lt;Integer&gt; {
     FA(8, "急救跟进"),
     RV(9, "回访跟进"),
     PL(10, "公共池跟进"),
+    SF(11, "补贴跟进"),
     /**
      * 其他
      * 目前只用于设置，并不参与具体跟进业务
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>fw-shirasawa-sdk</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <packaging>jar</packaging>
     <name>fw-shirasawa-sdk</name>
@@ -25,6 +25,7 @@ public enum DataTypeEnum implements IEnum&lt;Integer&gt; {
     FA(8, "急救"),
     RV(9, "回访"),
     PL(10, "公共池跟进"),
+    SF(11, "补贴跟进"),
     ;
     /**
@@ -4,6 +4,7 @@ import cn.fw.shirasawa.sdk.enums.BusinessTypeEnum;
 import cn.fw.shirasawa.sdk.enums.DataTypeEnum;
 import lombok.*;
+import javax.validation.constraints.Future;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -76,6 +77,7 @@ public class FollowGenerateDTO {
     /**
      * 截止时间
      */
+    @Future(message = "截止时间必须是未来时间")
     private Date deadline;
     /**
      * 首次跟进待办截止时间
@@ -56,6 +56,7 @@ follow:
     PFCode: 'O6zZjZ17st'
     FACode: ''
     RVCode: ''
+    SFCode: ''
   FmTemplateCode: 'SMS_215116996'
   RmTemplateCode: 'SMS_215072079'
   IrTemplateCode: ''
@@ -55,6 +55,7 @@ follow:
     PFCode: 'O6zZjZ17st'
     FACode: ''
     RVCode: ''
+    SFCode: ''
   FmTemplateCode: 'SMS_215116996'
   RmTemplateCode: 'SMS_215072079'
   IrTemplateCode: ''
@@ -66,6 +66,7 @@ follow:
     PFCode: 'O6zZjZ17st'
     FACode: ''
     RVCode: ''
+    SFCode: ''
   FmTemplateCode: ''
   RmTemplateCode: ''
   IrTemplateCode: ''
 \ No newline at end of file
@@ -145,6 +145,7 @@ follow:
     FACode: ''
     RVCode: ''
     PLCode: ''
+    SFCode: ''
   FmTemplateCode: ''
   RmTemplateCode: ''
   IrTemplateCode: ''
@@ -695,7 +695,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
      */
     protected boolean dealRepeatClue(CluePool cluePool, FollowStrategy strategy) {
         //判断是否可以去重
-        if (null == cluePool.getCoverFlag() || Boolean.FALSE.equals(cluePool.getCoverFlag())) {
+        if (!Boolean.TRUE.equals(cluePool.getCoverFlag())) {
             return false;
         }
         boolean isContainAF = false;
+package cn.fw.shirasawa.service.bus.follow.strategy.impl;
+
+import cn.fw.shirasawa.domain.db.OriginalData;
+import cn.fw.shirasawa.domain.db.follow.FollowRecord;
+import cn.fw.shirasawa.domain.db.follow.FollowTask;
+import cn.fw.shirasawa.domain.db.pool.CluePool;
+import cn.fw.shirasawa.domain.enums.ClueStatusEnum;
+import cn.fw.shirasawa.domain.enums.FollowTypeEnum;
+import cn.fw.shirasawa.service.bus.follow.strategy.AbstractFollowStrategy;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static cn.fw.common.businessvalidator.Validator.BV;
+
+/**
+ * 补贴跟进
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @className : SFFollowStrategy
+ * @description : 补贴跟进
+ * @date : 2023-03-13 15:16
+ */
+@Slf4j
+@Component
+@SuppressWarnings("Duplicates")
+public class SFFollowStrategy extends AbstractFollowStrategy {
+    @Value("${follow.todo.SFCode}")
+    @Getter
+    private String SFCode;
+
+    @Override
+    public FollowTypeEnum getFollowType() {
+        return FollowTypeEnum.SF;
+    }
+
+    @Override
+    public String getTodoCode() {
+        return getSFCode();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean origin2task(OriginalData originalData) throws Exception {
+        List<CluePool> list = cluePoolService.list(Wrappers.<CluePool>lambdaQuery()
+                .eq(CluePool::getClueType, getFollowType())
+                .eq(CluePool::getCustomerId, originalData.getCustomerId())
+                .eq(CluePool::getRefererId, originalData.getDetailId())
+                .eq(CluePool::getGroupId, originalData.getGroupId())
+                .in(CluePool::getClueStatus, ClueStatusEnum.ONGOING, ClueStatusEnum.WAITING)
+        );
+        if (!CollectionUtils.isEmpty(list)) {
+            return true;
+        }
+        CluePool cluePool = transformClue(originalData);
+        cluePool.setStartTime(originalData.getGenerateTime());
+        LocalDateTime deadLine = Optional.ofNullable(originalData.getDeadline()).orElse(LocalDate.now().plusYears(10L).atStartOfDay());
+        cluePool.setDeadline(deadLine.minusSeconds(1L));
+        return cluePoolService.save(cluePool);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void startClue(CluePool cluePool) throws Exception {
+        dealRepeatClue(cluePool, this);
+        FollowTask task = this.createTask(cluePool);
+        boolean saveTask = followTaskService.save(task);
+        BV.isTrue(saveTask, () -> "生成跟进任务失败");
+        FollowRecord record = createRecord(task);
+        record.setTodoCode(getTodoCode());
+        record.setNote(cluePool.getNote());
+        record.setContacts(cluePool.getContacts());
+        if (Objects.nonNull(cluePool.getFirstDeadline())) {
+            record.setDeadline(cluePool.getFirstDeadline());
+        }
+        followRecordService.save(record);
+
+        cluePool.setClueStatus(ClueStatusEnum.ONGOING);
+        cluePoolService.updateById(cluePool);
+    }
+}
@@ -28,7 +28,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <fw.shirasawa.sdk>1.0.2</fw.shirasawa.sdk>
+        <fw.shirasawa.sdk>1.0.3</fw.shirasawa.sdk>
         <!-- util -->
         <spring-retry.version>1.2.4.RELEASE</spring-retry.version>
         <!-- database -->