Merge branch 'dev_v1.5.14_wh' of jianyu/datatools into feature/v1.5.14

clueSync/everything.go

@@ -423,7 +423,9 @@ func bigCustomer() {
 					"data_requirement": data_requirement,
 				})
 			}
-			bigSaleTime = gconv.Int64(v["createtime"])
+			if gconv.Int64(v["createtime"]) > bigSaleTime {
+				bigSaleTime = gconv.Int64(v["createtime"])
+			}
 		}
 	}
 	cfg.BigSaleTime = bigSaleTime
@@ -605,7 +607,7 @@ func AdvisoryCommittee() {
 		log.Println("不是工作日，任务暂停")
 		return
 	}
-	log.Println("资询部线索定时任务开始")
+	log.Println("咨询部线索定时任务开始")
 	dataArr := []map[string]interface{}{}
 	filterArr := []string{"-pc", "-app", "-wx", "-h5"}
 	sourceMap := map[string]string{} //根据留资维表：tidb/Jianyu_subjectdb/d_saleleads_code
@@ -650,7 +652,7 @@ func AdvisoryCommittee() {
 				interest := common.ObjToString(v["interest"])
 				data_requirement := common.ObjToString(v["data_requirement"])
 				source := sourceMap[sources]
-				belongTo := "资询组"
+				belongTo := "咨询组"
 				userData := TiDb.FindOne("dwd_f_userbase_baseinfo", map[string]interface{}{"uid": uid}, "", "")
 				if userData != nil {
 					bt := common.ObjToString((*userData)["belong_to"])
@@ -678,7 +680,9 @@ func AdvisoryCommittee() {
 				})
 
 			}
-			advisoryCommitteeTime = gconv.Int64(v["createtime"])
+			if gconv.Int64(v["createtime"]) > advisoryCommitteeTime {
+				advisoryCommitteeTime = gconv.Int64(v["createtime"])
+			}
 		}
 		keyContent := fmt.Sprintf("data_%s_%s", time.Now().Format("2006-01-02"), "zx")
 		redis.Put("newother", keyContent, data, 86400)
@@ -695,7 +699,7 @@ func AdvisoryCommittee() {
 		style.Font.Bold = true
 		style.Alignment.Vertical = "center"
 		style.Alignment.Horizontal = "center"
-		detailName = "今日新增资询服务销售线索，请查收附件，及时跟进。"
+		detailName = "今日新增咨询服务销售线索，请查收附件，及时跟进。"
 		sh, _ := xf.AddSheet("线索数据")
 		row1 := sh.AddRow()
 		for _, x := range xlsxArr {
@@ -830,7 +834,9 @@ func marketCustomer() {
 				})
 
 			}
-			marketSaleTime = gconv.Int64(v["createtime"])
+			if gconv.Int64(v["createtime"]) > marketSaleTime {
+				marketSaleTime = gconv.Int64(v["createtime"])
+			}
 		}
 		keyContent := fmt.Sprintf("data_%s_%s", time.Now().Format("2006-01-02"), "sc")
 		redis.Put("newother", keyContent, data, 86400)