Merge branch 'master' into feature/v1.5.16

clueSync/job.go

@@ -201,7 +201,7 @@ func FormatData(data map[string]interface{}, item string) (bool, bool) {
 		phone = common.ObjToString(data["phone"])
 		sourceId = common.Int64All(data["sourceId"])
 	}
-	if cluename == "" && item != "message" && item != "orders" && item != "readClue" {
+	if cluename == "" && item != "message" && item != "orders" && item != "readClue" && item != "rebind" {
 		cluename = phone //没有线索名，手机号代替
 	}
 	cluename = strings.ReplaceAll(cluename, " ", "")
@@ -264,7 +264,12 @@ func FormatData(data map[string]interface{}, item string) (bool, bool) {
 	log.Println("data -------", position_id, seatNumber, saleName, pIsOk, isFreeze, noticePositionId)
 	if position_id > 0 && seatNumber != "" {
 		uCount, oks := TiDb.FindOne("dwd_f_crm_clue_info", map[string]interface{}{"uid": uId}, "", ""), true //查当前线索是否已存在
-		if uCount != nil && len(*uCount) > 0 {                                                               //已存在，走更新
+		if uCount != nil && len(*uCount) > 0 {
+			isUpdate := gconv.Int64((*uCount)["is_artificially_modified"])
+			if isUpdate == 1 {
+				cluename = ""
+			}
+			//已存在，走更新
 			batch_import := common.ObjToString((*uCount)["batch_import"])
 			if batch_import != "" && item == "users" { //有导入批次号还是新用户，不执行
 				return true, true

clueSync/jobutil.go

@@ -78,6 +78,10 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
 	isGroup, isCommerce := GetCompanyType(cluename)
 	uCount, _ := TiDb.FindOne("dwd_f_crm_clue_info", map[string]interface{}{"uid": uId}, "", ""), true //查当前线索是否已存在
 	if uCount != nil && len(*uCount) > 0 {
+		isUpdate := gconv.Int64((*uCount)["is_artificially_modified"])
+		if isUpdate == 1 {
+			cluename = ""
+		}
 		clueId := gconv.Int64((*uCount)["id"])
 		positionId := gconv.Int64((*uCount)["position_id"])
 		trailstatus := gconv.String((*uCount)["trailstatus"])

telemarketingEtl/entity/dwd_f_userbase_visit_info.go

@@ -135,7 +135,7 @@ func VisitInfoAdd(start, end int64) {
 					config.JianyuSubjectdb.InsertBySql(`INSERT INTO dwd_f_userbase_visit_info (userid,date, number, platform,createtime,contentnum,portraitnum,searchnum) VALUES (?,?,?,?,?,?,?,?)`, userId, vi.lastLoginTime, 1, vi.platform, vi.lastLoginTime, vi.contentNum, vi.portraitNum, vi.searchNum)
 				}
 				if config.JianyuSubjectdb.CountBySql(`select count(1) from dwd_f_crm_attribute_label where uid=?`, vi.uId) > 0 {
-					config.JianyuSubjectdb.ExecBySql("update dwd_f_crm_attribute_label set last_login_time=? where uid=?", vi.uId, lastLogin[userId])
+					config.JianyuSubjectdb.ExecBySql("update dwd_f_crm_attribute_label set last_login_time=? where uid=?", lastLogin[userId], vi.uId)
 				} else {
 					config.JianyuSubjectdb.InsertBatch("dwd_f_crm_attribute_label", []string{"uid", "last_login_time", "updatetime"}, []interface{}{vi.uId, lastLogin[userId], gtime.Now().String()})
 				}