冻结问题修改

clueSync/job.go

@@ -233,11 +233,8 @@ func FormatData(data map[string]interface{}, item string) (bool, bool) {
 		log.Println("线索分配失败，线索过滤top_cluetype！！", item, uId, phone, userId)
 		return true, true
 	}
-	position_id, seatNumber, saleName, saleData, pIsOk, isFreeze, isWait := autoDraw(level, cluename, phone, isGroup, isCommerce) //查询当前分配次数最少的，如果当前线索有销售，此次找出的不会+1
+	position_id, seatNumber, saleName, saleData, pIsOk, isFreeze := autoDraw(level, cluename, phone, isGroup, isCommerce) //查询当前分配次数最少的，如果当前线索有销售，此次找出的不会+1
 	log.Println("data -------", position_id, seatNumber, saleName)
-	if isWait {
-		return true, false
-	}
 	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 {                                                               //已存在，走更新

clueSync/jobutil.go

@@ -386,7 +386,7 @@ func getClueType(item string, data map[string]interface{}, sourceCode string, so
 }
 
 // 获取自动分配的人
-func autoDraw(mode, cluename, phone string, isGroup, isCommerce int) (positionId int64, seatNumber, saleName string, saleData []map[string]interface{}, isOk, isFreeze, isWait bool) {
+func autoDraw(mode, cluename, phone string, isGroup, isCommerce int) (positionId int64, seatNumber, saleName string, saleData []map[string]interface{}, isOk, isFreeze bool) {
 	isOk = false
 	isFreeze = false
 	if TiDb.Count("dwd_f_crm_clue_info", map[string]interface{}{"phone": phone, "is_assign": 1}) == 0 { //线索没销售进入，有销售走分配次数最少的逻辑
@@ -415,11 +415,13 @@ func autoDraw(mode, cluename, phone string, isGroup, isCommerce int) (positionId
 												return
 											}
 										}
-										isWait = true
+										isFreeze = true
+										positionId = 0
+										seatNumber = ""
+										saleName = ""
 										return
 									}
 								} else {
-									saleName = common.ObjToString(v["name"])
 									if FindUpperLimit(gconv.String(positionId), "positionId") {
 										isFreeze = true
 									}