Merge branch 'master' into feature/v1.5.13

clueSync/job.go

@@ -208,7 +208,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" && item != "rebind" {
+	if cluename == "" && item != "message" && item != "orders" && item != "readClue" && item != "rebind" && item != "allocation" {
 		cluename = phone //没有线索名，手机号代替
 	}
 	cluename = strings.ReplaceAll(cluename, " ", "")

clueSync/kc.go

@@ -437,8 +437,7 @@ func ordersClue() {
 						source = common.ObjToString((*userInfo)["source"])
 					} else {
 						log.Println("后台订单--未查询到 ", user_phone)
-						//break
-						continue
+						break
 					}
 				} else {
 					if !mongodb.IsObjectIdHex(userId) {
@@ -447,8 +446,7 @@ func ordersClue() {
 							userId = common.ObjToString((*userMapping)["userid"])
 						} else {
 							log.Println("后台订单--未查询到 ", user_phone)
-							//break
-							continue
+							break
 						}
 					}
 					query["userid"] = userId
@@ -458,8 +456,7 @@ func ordersClue() {
 						source = common.ObjToString((*userInfo)["source"])
 					} else {
 						log.Println("后台订单--未查询到 ", query, user_phone)
-						//break
-						continue
+						break
 					}
 				}
 				is_assign := 1