Merge branch 'dev_v1.5.21.7_wh' of jianyu/datatools into hotfix/v1.5.21.7

clueSync/everything.go

@@ -412,7 +412,7 @@ func bigCustomer() {
 					if strings.HasPrefix(bt, "03") || bt == "0102" {
 						continue
 					}
-					s_sourceid := common.ObjToString((*userData)["s_sourceid"])
+					/*s_sourceid := common.ObjToString((*userData)["s_sourceid"])
 					if s_sourceid == db.Sourceid {
 						//安博会数据
 						abhList = append(abhList, map[string]interface{}{
@@ -435,7 +435,7 @@ func bigCustomer() {
 							bigSaleTime = gconv.Int64(v["createtime"])
 						}
 						continue
-					}
+					}*/
 				}
 
 				dataArr = append(dataArr, map[string]interface{}{
@@ -711,6 +711,7 @@ func FindBatch(moudle string) string {
 	batch := redis.Incr("newother", key)
 	return fmt.Sprintf("%04d", batch)
 }
+
 func FindBatchData(moudle string) map[string]interface{} {
 	now := time.Now().Format("2006-01-02")
 	//数据提取
@@ -837,11 +838,12 @@ func processLeads(batch string, committeeTime int64, sourceMap map[string]string
 			lead := map[string]interface{}{}
 			lead, endtime = processLead(v, sourceMap, nowTime, committeeTime, data)
 			if lead != nil {
-				if isABHLead(lead) {
-					abhList = append(abhList, lead)
-				} else {
-					dataArr = append(dataArr, lead)
-				}
+				/*	if isABHLead(lead) {
+						abhList = append(abhList, lead)
+					} else {
+						dataArr = append(dataArr, lead)
+					}*/
+				dataArr = append(dataArr, lead)
 			}
 		}
 		saveDataToRedis(data, batch)

clueSync/job.go

@@ -251,9 +251,9 @@ func FormatData(data map[string]interface{}, item string) (bool, bool, bool) {
 		return true, true, true
 	}
 	//安博会
-	if s_sourceid == db.Sourceid {
+	/*if s_sourceid == db.Sourceid {
 		return true, true, false
-	}
+	}*/
 	if uId == "" { //没有进用户归集，等待进入，结束任务，放在下次继续执行
 		if isExists, _ := redis.Exists("bidx", "bidx_userId_"+userId); isExists {
 			redisInt := redis.GetInt("bidx", "bidx_userId_"+userId)

clueSync/jobutil.go

@@ -771,6 +771,7 @@ func userbase() {
 		dwd_f_userbase_contacts a
 	INNER JOIN dwd_f_userbase_baseinfo b ON
 	    b.status= 1 
+	    and  (b.s_platform != 'xcx' or  b.s_platform is  NULL)
 		AND a.phone = b.phone and a.baseinfo_id= b.uid and     a.source  ="0101"
   		and  a.phone  is  not   NULL  
 		and   a.createtime   >="%s"