wanghao

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

@@ -125,7 +125,11 @@
       ]
     },
     {
+<<<<<<< HEAD
       "topName": "进入购买页但未提交订单用户",
+=======
+      "topName": "公海中电销历史标记用户",
+>>>>>>> master
       "subName": "访问付费产品购买页的近期未建联用户",
       "conditionArr": [
         {
@@ -145,8 +149,12 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
+=======
+    },{
+>>>>>>> master
       "topName": "进入购买页但未提交订单用户",
       "subName": "进入超级订阅购买页单未提交订单",
       "conditionArr": [
@@ -167,8 +175,12 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
+=======
+    },{
+>>>>>>> master
       "topName": "进入购买页但未提交订单用户",
       "subName": "进入大会员购买页单未提交订单",
       "conditionArr": [
@@ -189,8 +201,12 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
+=======
+    },{
+>>>>>>> master
       "topName": "进入购买页但未提交订单用户",
       "subName": "进入省份订阅包购买页单未提交订单",
       "conditionArr": [
@@ -211,8 +227,12 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
+=======
+    },{
+>>>>>>> master
       "topName": "进入购买页但未提交订单用户",
       "subName": "进入业主采购分析报告下载包购买页单未提交订单",
       "conditionArr": [
@@ -233,8 +253,12 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
+=======
+    },{
+>>>>>>> master
       "topName": "进入购买页但未提交订单用户",
       "subName": "进入企业中标分析报告下载包购买页单未提交订单",
       "conditionArr": [
@@ -255,8 +279,12 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
+=======
+    },{
+>>>>>>> master
       "topName": "进入购买页但未提交订单用户",
       "subName": "进入市场分析定制报告下载包购买页单未提交订单",
       "conditionArr": [
@@ -277,8 +305,12 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
+=======
+    },{
+>>>>>>> master
       "topName": "进入购买页但未提交订单用户",
       "subName": "进入采购单位画像包购买页单未提交订单",
       "conditionArr": [
@@ -299,8 +331,12 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
+=======
+    },{
+>>>>>>> master
       "topName": "进入购买页但未提交订单用户",
       "subName": "进入附件下载包购买页单未提交订单",
       "conditionArr": [
@@ -321,8 +357,12 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
+=======
+    },{
+>>>>>>> master
       "topName": "进入购买页但未提交订单用户",
       "subName": "进入投标企业信用报告购买页单未提交订单",
       "conditionArr": [
@@ -343,6 +383,7 @@
           "fool": false
         }
       ]
+<<<<<<< HEAD
     },
     {
       "topName": "进入购买页但未提交订单用户",
@@ -607,6 +648,8 @@
           "fool": false
         }
       ]
+=======
+>>>>>>> master
     }
   ]
 }

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 {