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

clueSync/job.go

@@ -65,6 +65,7 @@ func FormatData(data map[string]interface{}, item string) (bool, bool, bool) {
 		}) > 0 {
 			return true, true, true
 		}
+		sourceCode = gconv.String(data["rsource"])
 		userId = mongodb.BsonIdToSId(data["userid"])
 		//新用户没有uid、source要等5分钟
 		cluename = gconv.String(data["company_name"])

clueSync/jobutil.go

@@ -563,7 +563,8 @@ func users() {
 	//新用户注册后5分钟内进入线索 C
 	log.Println("新注册用户定时任务开始")
 	selectTimeEnd := cfg.LastUserId
-	sql := fmt.Sprintf(`select * from dwd_f_userbase_baseinfo   where createtime > "%s" and (s_platform != 'xcx' or  s_platform is  NULL)  and source = "0101" and status != 2  order by  createtime asc`, selectTimeEnd)
+	sql := fmt.Sprintf(`select * from dwd_f_userbase_baseinfo   where createtime > "%s" and (s_platform != 'xcx'   or  s_platform is  NULL)  and source = "0101" and status != 2  order by  createtime asc`, selectTimeEnd)
+	//sql := fmt.Sprintf(`select * from dwd_f_userbase_baseinfo   where id= 2259277`)
 	data := TiDb.SelectBySql(sql)
 	abhList := []map[string]interface{}{}
 	if data != nil && *data != nil && len(*data) > 0 {
@@ -955,12 +956,18 @@ func getClueType(item string, data map[string]interface{}, sourceCode string, so
 			code = "9"
 			subname = "数据自助导出"
 		}
-	} else if item == "users" {
+	} else if item == "users" && sourceCode != "bidCreditReportPreview" && sourceCode != "bidCreditReportFile" {
 		pcode = "4"
 		code = "154"
 		level = "C"
 		topname = "新增注册"
 		subname = "新增注册用户"
+	} else if item == "users" && (sourceCode == "bidCreditReportPreview" || sourceCode == "bidCreditReportFile") {
+		pcode = "4"
+		code = "767"
+		level = "B"
+		topname = "新增注册"
+		subname = "信用报告引流用户"
 	} else if item == "message" {
 		pcode = "532"
 		code = "477"