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

张志伟
2 parents 710ff197 e7d46d15
Showing 3 changed files with 69 additions and 50 deletions
doc/v1.0.0/data处理sql.sql
doc/v1.0.1/升级事项.md
fw-valhalla-common/src/main/java/cn/fw/valhalla/common/constant/RoleCode.java
 -- 订单数据处理
+DELETE FROM follow_task WHERE type = 1;
+DELETE FROM follow_record WHERE type = 1;
+DELETE FROM follow_notice_record WHERE follow_type = 1;
+DELETE FROM original_data WHERE type = 1;
+
 insert into fw_valhalla.original_data(type, customer_id, generate_time, detail_id, solved, group_id, create_time,
                                       update_time)
 SELECT 1,
@@ -9,81 +14,97 @@ SELECT 1,
        w1.group_id,
        now(),
        now()
-from `fw_order_v2.9.7`.car_order w1
-         inner JOIN `fw_order_v2.9.7`.car_delivery_info w2 on w1.id = w2.order_id
-where w1.id in (
+from `fw_valhalla`.car_order w1
+         inner JOIN `fw_valhalla`.car_delivery_info w2 on w1.id = w2.order_id
+         INNER JOIN fw_valhalla.customer w3 on w1.car_vin = w3.frame_no
+where w3.adviser_id is not NULL and  w1.id in (
     select max(w1.id) as id
-    from `fw_order_v2.9.7`.car_order w1
-             inner JOIN `fw_order_v2.9.7`.car_delivery_info w2 on w1.id = w2.order_id
+    from `fw_valhalla`.car_order w1
+             inner JOIN `fw_valhalla`.car_delivery_info w2 on w1.id = w2.order_id
     where w2.delivery_done = 1
       and w1.group_id = 2
       and w1.order_canceled = 0
-      and w2.delivery_date >= DATE_ADD(NOW(), INTERVAL - 9 MONTH)
+      and w2.delivery_date >= DATE_ADD(NOW(), INTERVAL - 61 DAY )
     group by w1.cust_archive_id
 );
 -- 保险数据处理
+DELETE FROM follow_task WHERE type = 4;
+DELETE FROM follow_record WHERE type = 4;
+DELETE FROM follow_notice_record WHERE follow_type = 4;
+DELETE FROM original_data WHERE type = 4;
+
 insert into fw_valhalla.original_data(type, customer_id, generate_time, detail_id, solved, group_id, create_time,
                                       update_time)
 SELECT 4,
-       w1.cus_id,
-       DATE_ADD(w1.effective_date, INTERVAL + 1 YEAR),
        w1.id,
-       0,
+       w1.buy_date,
+       -1 * w1.id,
+       1,
        w1.group_id,
        now(),
        now()
-from fw_angel.insurance_policy w1
-where w1.id in (
-    select max(w1.id) as id
-    from fw_angel.insurance_policy w1
-    where w1.issue_date >= DATE_ADD(NOW(), INTERVAL - 4 MONTH)
-    group by w1.cus_id
-);
+from fw_valhalla.customer w1 WHERE w1.yn=1;
+
+UPDATE original_data
+SET generate_time = DATE_ADD( generate_time, INTERVAL + 1 YEAR )
+WHERE
+        type=4 and
+        generate_time < DATE_ADD(
+            NOW(),
+            INTERVAL - 304 DAY);
+
+
 -- 售后工单首保处理
+DELETE FROM original_data WHERE type = 2;
 insert into fw_valhalla.original_data(type, customer_id, generate_time, detail_id, solved, group_id, create_time,
                                       update_time)
 SELECT 2,
-       customer_id,
-       actual_pickup_time,
-       id,
+       t1.customer_id,
+       t1.actual_pickup_time,
+       t1.id,
        0,
-       group_id,
+       t1.group_id,
        now(),
        now()
-from fw_cas.`order`
-where id in (
-    select max(id) as id
-    from fw_cas.`order`
-    where metal_sheet = 0
-      and `status` = 9
-      and (FIND_IN_SET(2, type) or FIND_IN_SET(2, type))
-      and customer_id is not null
-      and actual_pickup_time >= DATE_ADD(NOW(), INTERVAL - 5 MONTH)
-    group by customer_id
+from fw_cas.`order` t1 inner join fw_valhalla.customer t2 on t1.customer_id = t2.id
+where t2.adviser_id is not null and t1.id in (
+    select max(t3.id) as id
+    from fw_cas.`order` t3
+    where t3.metal_sheet = 0
+      and t3.`status` = 9
+      and (FIND_IN_SET(2, t3.type) or FIND_IN_SET(2, t3.type))
+      and t3.customer_id is not null
+      and t3.actual_pickup_time >= DATE_ADD(NOW(), INTERVAL - 65 DAY )
+    group by t3.customer_id
 );
 -- 流失客户数据处理
+DELETE FROM follow_task WHERE type = 2;
+DELETE FROM follow_record WHERE type = 2;
+DELETE FROM follow_notice_record WHERE follow_type = 2;
+DELETE FROM original_data WHERE type = 5;
+
 insert into fw_valhalla.original_data(type, customer_id, generate_time, detail_id, solved, group_id, create_time,
                                       update_time)
 SELECT 5,
-       customer_id,
-       actual_pickup_time,
-       id,
+       t1.customer_id,
+       t1.actual_pickup_time,
+       t1.id,
        0,
-       group_id,
+       t2.group_id,
        now(),
        now()
-from fw_cas.`order`
-where id in (
-    select max(id) as id
-    from fw_cas.`order`
-    where `status` = 9
-      and customer_id is not null
-      and actual_pickup_time >= DATE_ADD(NOW(), INTERVAL - 5 MONTH)
-    group by customer_id
+from fw_cas.`order` t1 inner join fw_valhalla.customer t2 on t1.customer_id = t2.id
+where t2.adviser_id is not null and t1.id in (
+    select max(t3.id) as id
+    from fw_cas.`order` t3
+    where t3.`status` = 9
+      and t3.customer_id is not null
+      and t3.actual_pickup_time >= DATE_ADD(NOW(), INTERVAL - 120 DAY )
+    group by t3.customer_id
 );
@@ -11,6 +11,12 @@
     AsCrmOwnFollowUpPool 跟进池  菜单
     /app/pool/follow/** 跟进池列表请求url 
+##### 其他配置：
+- 待办
+   |待办项|待办路径| 通知对象|
+   | --|--|--|
+   |保有客离职分配|ASCustomerDistribute| 保有客分配|
+    
 ##### 升级内容:
 1. 去掉战败池和成交池
@@ -16,18 +16,10 @@ public interface RoleCode {
      */
     String SGCGJ = "SGCGJ";
     /**
-     * 首保跟进
-     */
-    String SBGJ = "SBGJ";
-    /**
      * 续保跟进
      */
     String XBGJ = "XBGJ";
     /**
-     * 流失客户跟进
-     */
-    String LSKHGJ = "LSKHGJ";
-    /**
      * 保有客分配
      */
     String BYKFP = "BYKFP";