Merge branch 'master' into hotfix/v1.5.36.4

clueSync/autoTask.go

@@ -625,7 +625,7 @@ func ClueToDxTask() {
 			if gconv.Int(val["ent_id"]) == 0 {
 				continue
 			}
-			data := TiDb.Query("SELECT userid,uid FROM dwd_f_userbase_id_mapping WHERE ent_id = ?", gconv.Int(val["ent_id"]))
+			data := TiDb.Query("SELECT userid,uid FROM data_service.user_system WHERE ent_id = ?", gconv.Int(val["ent_id"]))
 			if data != nil && len(*data) > 0 {
 				log.Println("企业下员工数：", gconv.Int(val["ent_id"]), len(*data))
 				for _, vv := range *data {

clueSync/everything.go

@@ -396,13 +396,13 @@ func bigCustomer() {
 			userid := common.ObjToString(v["userid"])
 			uid := ""
 			if !mongodb.IsObjectIdHex(userid) {
-				userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"position_id": userid}, "", "")
+				userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"position_id": userid}, "", "")
 				if userMapping != nil && len(*userMapping) > 0 {
 					userid = common.ObjToString((*userMapping)["userid"])
 					uid = common.ObjToString((*userMapping)["uid"])
 				}
 			} else {
-				userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"userid": userid}, "", "")
+				userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"userid": userid}, "", "")
 				if userMapping != nil && len(*userMapping) > 0 {
 					userid = common.ObjToString((*userMapping)["userid"])
 					uid = common.ObjToString((*userMapping)["uid"])
@@ -473,7 +473,7 @@ func bigCustomer() {
 			orderUserId := gconv.String(v["user_id"])
 			query := map[string]interface{}{}
 			if !mongodb.IsObjectIdHex(orderUserId) {
-				userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"position_id": orderUserId}, "", "")
+				userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"position_id": orderUserId}, "", "")
 				if userMapping != nil && len(*userMapping) > 0 {
 					uid := common.ObjToString((*userMapping)["uid"])
 					query["uid"] = uid
@@ -815,8 +815,7 @@ func processLead(v map[string]interface{}, sourceMap map[string]map[string]inter
 		return nil, lastTime
 	}
 	// 获取用户信息
-	userData := getUserData(v)
-	if userData == nil || isUserInBlackList(userData) {
+	if getUserData(v) {
 		return nil, lastTime
 	}
 	key := fmt.Sprintf("%s_%s_%s", sources, phone, common.ObjToString(v["interest"]))
@@ -842,19 +841,26 @@ func processLead(v map[string]interface{}, sourceMap map[string]map[string]inter
 }
 
 // 获取用户数据
-func getUserData(v map[string]interface{}) map[string]interface{} {
+func getUserData(v map[string]interface{}) bool {
 	userid := gconv.String(v["userid"])
 	userMapping := &map[string]interface{}{}
 	if !mongodb.IsObjectIdHex(userid) {
-		userMapping = TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"position_id": userid}, "", "")
+		userMapping = TiDb.FindOne("data_service.user_system", map[string]interface{}{"position_id": userid}, "", "")
 	} else {
-		userMapping = TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"userid": userid}, "", "")
+		userMapping = TiDb.FindOne("data_service.user_system", map[string]interface{}{"userid": userid}, "", "")
 	}
-
-	if userMapping != nil && len(*userMapping) > 0 {
-		return *userMapping
+	if userMapping == nil || len(*userMapping) == 0 {
+		return false
 	}
-	return nil
+	uid := gconv.String((*userMapping)["uid"])
+	userData := TiDb.FindOne("dwd_f_userbase_baseinfo", map[string]interface{}{"uid": uid}, "", "")
+	if userData != nil {
+		bt := common.ObjToString((*userData)["belong_to"])
+		if strings.HasPrefix(bt, "03") || bt == "0102" {
+			return true
+		}
+	}
+	return false
 }
 
 // 判断用户是否在黑名单

clueSync/job.go

@@ -25,7 +25,7 @@ func FormatData(data map[string]interface{}, item string) (bool, bool, bool) {
 	if item == "orders" { //订单
 		if !mongodb.IsObjectIdHex(userId) {
 			positionId = userId
-			userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"position_id": userId}, "", "")
+			userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"position_id": userId}, "", "")
 			if userMapping != nil && len(*userMapping) > 0 {
 				userId = gconv.String((*userMapping)["userid"])
 			}
@@ -40,7 +40,7 @@ func FormatData(data map[string]interface{}, item string) (bool, bool, bool) {
 		cluename = gconv.String(data["company_name"])
 		phone = gconv.String(data["user_phone"])
 	} else if item == "message" {
-		userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"base_user_id": common.Int64All(data["own_id"])}, "", "")
+		userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"base_user_id": common.Int64All(data["own_id"])}, "", "")
 		if userMapping != nil && len(*userMapping) > 0 {
 			userId = gconv.String((*userMapping)["userid"])
 			positionId = fmt.Sprint((*userMapping)["position_id"])
@@ -60,7 +60,7 @@ func FormatData(data map[string]interface{}, item string) (bool, bool, bool) {
 			}
 		}
 	} else if item == "tag" {
-		userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"base_user_id": common.Int64All(data["baseUserId"])}, "", "")
+		userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"base_user_id": common.Int64All(data["baseUserId"])}, "", "")
 		if userMapping != nil && len(*userMapping) > 0 {
 			userId = gconv.String((*userMapping)["userid"])
 			positionId = fmt.Sprint((*userMapping)["position_id"])
@@ -149,7 +149,7 @@ func FormatData(data map[string]interface{}, item string) (bool, bool, bool) {
 		userId = gconv.String(data["userid"])
 		if !mongodb.IsObjectIdHex(userId) {
 			positionId = userId
-			userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"position_id": userId}, "", "")
+			userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"position_id": userId}, "", "")
 			if userMapping != nil && len(*userMapping) > 0 {
 				userId = gconv.String((*userMapping)["userid"])
 			}

clueSync/kc.go

@@ -560,7 +560,7 @@ func ordersClue() {
 				query := map[string]interface{}{}
 				source := ""
 				if !mongodb.IsObjectIdHex(userId) {
-					userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"position_id": userId}, "", "")
+					userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"position_id": userId}, "", "")
 					if userMapping != nil && len(*userMapping) > 0 {
 						userId = gconv.String((*userMapping)["userid"])
 					} else {

clueSync/subscribe.go

@@ -43,7 +43,7 @@ func FormatSubscribeData(data map[string]interface{}) {
 	// createtime := common.Int64All(data["createtime"])
 	userId := common.ObjToString(data["userid"])
 	if !mongodb.IsObjectIdHex(userId) {
-		userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"position_id": userId}, "", "")
+		userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"position_id": userId}, "", "")
 		if userMapping != nil && len(*userMapping) > 0 {
 			userId = common.ObjToString((*userMapping)["userid"])
 		}

clueSync/util.go

@@ -43,7 +43,7 @@ func GetUidToUserId(userId string, phone string) (string, string) {
 		}
 	} else {
 		if !mongodb.IsObjectIdHex(userId) {
-			userMapping := TiDb.FindOne("dwd_f_userbase_id_mapping", map[string]interface{}{"position_id": userId}, "", "")
+			userMapping := TiDb.FindOne("data_service.user_system", map[string]interface{}{"position_id": userId}, "", "")
 			if userMapping != nil && len(*userMapping) > 0 {
 				userId = common.ObjToString((*userMapping)["userid"])
 			} else {
@@ -64,7 +64,7 @@ func getUserIdToUid(uid string) []string {
 	personData := TiDb.SelectBySql(`SELECT  
 	IF(type=0,userid,position_id)  as   positionId   
 FROM
-	dwd_f_userbase_id_mapping 
+	data_service.user_system 
 WHERE
 	uid = ?       group by  positionId    `, uid)
 	if personData == nil || len(*personData) == 0 {