Merge branch 'master' into hotfix/v1.5.36.4

clueSync/jobutil.go

@@ -506,7 +506,7 @@ func orders() {
 	DataSql := fmt.Sprintf(`select a.*,b.product_type as productType ,b.service_starttime,b.service_endtime,b.filter AS productFilter     from  dataexport_order  a  
     INNER JOIN   jy_order_detail   b    on   a.order_code=b.order_code
     and    a.create_time<="%s" and a.create_time>="%s" and b.product_type in  (%s) 
-    and a.order_status = 0 and   a.is_backstage_order = 0  and    a.id> %s`,
+    and a.order_status = 0 and   a.is_backstage_order = 0  and    a.id> %s order by b.id  asc`,
 		selectTimeEnd, selectTimeStart, product_type_str1, gconv.String(lastOrderId))
 	data, _ := getOrderData(DataSql)
 	if data != nil && data != nil && len(data) > 0 {

clueSync/kc.go

@@ -43,6 +43,7 @@ FROM
 	AND b.update_time > "%s"
 
 ORDER BY
+    b.update_time asc ,
 	a.order_code ASC,
 	difference desc ,
 	b.final_price DESC `
@@ -100,7 +101,7 @@ ORDER BY
 		for _, v := range *data {
 			orderCode := gconv.String(v["order_code"])
 			if _, exists := orderMap[orderCode]; exists {
-				status := kcJob(v)
+				status := kcJob(orderMap[orderCode])
 				log.Println("订单进客成打印", orderCode, status)
 				if status == 0 {
 					break

clueSync/lable.json

@@ -121,6 +121,217 @@
           "fool": false
         }
       ]
+    },
+    {
+      "topName": "公海中电销历史标记用户",
+      "subName": "访问付费产品购买页的近期未建联用户",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_7day_gte7",
+          "fool": true
+        },
+        {
+          "code": "has_order_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
+    },{
+      "topName": "进入购买页但未提交订单用户",
+      "subName": "进入超级订阅购买页单未提交订单",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_vip_1_day",
+          "fool": true
+        },
+        {
+          "code": "has_order_vip_1_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
+    },{
+      "topName": "进入购买页但未提交订单用户",
+      "subName": "进入大会员购买页单未提交订单",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_member_1_day",
+          "fool": true
+        },
+        {
+          "code": "has_order_member_1_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
+    },{
+      "topName": "进入购买页但未提交订单用户",
+      "subName": "进入省份订阅包购买页单未提交订单",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_areavip_1_day",
+          "fool": true
+        },
+        {
+          "code": "has_order_areavip_1_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
+    },{
+      "topName": "进入购买页但未提交订单用户",
+      "subName": "进入业主采购分析报告下载包购买页单未提交订单",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_buyer_report_package_1_day",
+          "fool": true
+        },
+        {
+          "code": "has_order_buyer_report_1_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
+    },{
+      "topName": "进入购买页但未提交订单用户",
+      "subName": "进入企业中标分析报告下载包购买页单未提交订单",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_winner_report_package_1_day",
+          "fool": true
+        },
+        {
+          "code": "has_order_winner_report_1_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
+    },{
+      "topName": "进入购买页但未提交订单用户",
+      "subName": "进入市场分析定制报告下载包购买页单未提交订单",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_market_report_package_1_day",
+          "fool": true
+        },
+        {
+          "code": "has_order_market_report_1_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
+    },{
+      "topName": "进入购买页但未提交订单用户",
+      "subName": "进入采购单位画像包购买页单未提交订单",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_buyer_portrait_package_1_day",
+          "fool": true
+        },
+        {
+          "code": "has_order_buyer_portrait_package_1_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
+    },{
+      "topName": "进入购买页但未提交订单用户",
+      "subName": "进入附件下载包购买页单未提交订单",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_attach_package_1_day",
+          "fool": true
+        },
+        {
+          "code": "has_order_attach_package_1_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
+    },{
+      "topName": "进入购买页但未提交订单用户",
+      "subName": "进入投标企业信用报告购买页单未提交订单",
+      "conditionArr": [
+        {
+          "code": "visit_buypage_ent_credit_report_1_day",
+          "fool": true
+        },
+        {
+          "code": "has_order_ent_credit_report_1_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_follow_7_day",
+          "fool": false
+        },
+        {
+          "code": "telemarketing_listen_7_day",
+          "fool": false
+        }
+      ]
     }
   ]
 }

clueSync/log.go

@@ -37,7 +37,7 @@ func initLog(saveDay int) {
 	go logfile()
 	task := cron.New()
 	task.Start()
-	task.AddFunc("0 0 0/2 * * ?", func() {
+	task.AddFunc("0 0 0/6 * * ?", func() {
 		go logfile()
 		time.Sleep(50 * time.Second)
 		if saveDay > 0 {