feature(*): 新增区域站岗线索池

- 新增区域站岗线索池

feature(*): 新增区域站岗线索池
- 新增区域站岗线索池
张志伟
1 parent 953745ee
Showing 10 changed files with 23 additions and 3 deletions
doc/v2.0/update.sql
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
fw-valhalla-dao/src/main/resources/mapper/PubCluePoolMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/follow/ClueTask.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowPoolDTO.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/pool/FollowPoolListVO.java
fw-valhalla-server/src/main/resources/application-local.yml
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/IRFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/PubFollowStrategy.java
@@ -2,6 +2,9 @@ drop table if exists customer_clue_pool;
  
 drop table if exists follow_task;
  
+alter table clue_task
+    add version int null after rpc_success;
+
 alter table customer
     add last_arrival_shop bigint null comment '上次进站门店' after arrival_time;
  
@@ -28,6 +28,7 @@
         t1.state state,
         t1.close_time close_time,
         t1.reason initiative,
+        t1.version version,
         t1.group_id group_id
         FROM clue_task t1
         left join follow_clue t6 on t1.clue_id=t6.id
@@ -37,7 +38,7 @@
         left join customer_loan_info t2 on t6.vin = t2.frame_no and t6.group_id = t2.group_id
         <where>
             t1.group_id = #{condition.groupId}
-            and t1.tye != 10
+            and t1.type != 10
             <if test="condition.userId !=null">
                 and t1.follow_user = #{condition.userId}
             </if>
@@ -118,7 +119,7 @@
         left join customer_loan_info t2 on t6.vin = t2.frame_no and t6.group_id = t2.group_id
         <where>
             t1.group_id = #{condition.groupId}
-            and t1.tye != 10
+            and t1.type != 10
             <if test="condition.userId !=null">
                 and t1.follow_user = #{condition.userId}
             </if>
@@ -29,6 +29,7 @@
         t1.state state,
         t1.close_time close_time,
         t1.reason initiative,
+        t1.version version,
         t1.group_id group_id
         FROM clue_task t1
         left join pub_clue_pool t6 on t1.clue_id=t6.id
@@ -79,4 +79,8 @@ public class ClueTask extends BaseAuditableTimeEntity&lt;ClueTask, Long&gt; {
      * 已跟进次数
      */
     private Integer times;
+    /**
+     * 版本
+     */
+    private Integer version;
 }
@@ -102,4 +102,8 @@ public class FollowPoolDTO {
      */
     private Long groupId;
     private Integer sourceType;
+    /**
+     * 版本
+     */
+    private Integer version;
 }
@@ -101,6 +101,10 @@ public class FollowPoolListVO {
      */
     private Long groupId;
     private Integer sourceType;
+    /**
+     * 版本
+     */
+    private Integer version;
  
     public String getRemaining() {
         if (Objects.isNull(remaining) || state != 1) {
@@ -7,7 +7,7 @@ spring:
       preferred-networks:
         - 10.8
   application:
-    name: fw-valhalla-local
+    name: fw-valhalla
   datasource:
     hikari:
       connection-test-query: ''
@@ -666,6 +666,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         }
         clueTask.setFollowShop(shopId);
         clueTask.setFollowUser(userId);
+        clueTask.setVersion(2);
         return clueTask;
     }
  
@@ -264,6 +264,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
         }
         clueTask.setFollowShop(shopId);
         clueTask.setFollowUser(userId);
+        clueTask.setVersion(2);
         return clueTask;
     }
  
@@ -124,6 +124,7 @@ public class PubFollowStrategy implements FollowStrategy {
         clueTask.setFollowShop(pubClue.getShopId());
         clueTask.setFollowUser(pubClue.getAdviserId());
         clueTask.setFollowUserName(pubClue.getAdviserName());
+        clueTask.setVersion(2);
         clueTaskService.save(clueTask);
         final FollowInitDTO followInitDTO = creteFollowInitDTO(pubClue, clueTask);
         shirasawaRpcService.createFollowData(followInitDTO);