Explorar o código

Merge branch 'dev_v1.5.2_wh' of jianyu/datatools into feature/v1.5.2

王浩 hai 1 ano
pai
achega
22df7771fa
Modificáronse 1 ficheiros con 2 adicións e 17 borrados
  1. 2 17
      clueSync/job.go

+ 2 - 17
clueSync/job.go

@@ -234,7 +234,7 @@ func FormatData(data map[string]interface{}, item string) (bool, bool) {
 		return true, true
 	}
 	position_id, seatNumber, saleName, saleData, pIsOk, isFreeze, noticePositionId := autoDraw(level, cluename, phone, isGroup, isCommerce) //查询当前分配次数最少的,如果当前线索有销售,此次找出的不会+1
-	log.Println("data -------", position_id, seatNumber, saleName)
+	log.Println("data -------", position_id, seatNumber, saleName, saleData, 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 {                                                               //已存在,走更新
@@ -402,21 +402,7 @@ func SaveClue(item, userId, uId, top_cluetype, sub_cluetype, topname, subname, c
 			"BCPCID":       common.GetRandom(32),
 			"operator_id":  -1,
 		})
-		////冻结处理
-		/*if isFreeze {
-			TiDb.InsertByTx(tx, "dwd_f_crm_clue_change_record", map[string]interface{}{
-				"createtime":  nowTime,
-				"BCPCID":      common.GetRandom(32),
-				"operator_id": -1,
-				"clue_id":     clueId,
-				"position_id": positionId,
-				"change_type": "线索冻结",
-				"new_value":   "销售人员私海已达上限",
-			})
-			//消息发送
-			AssFail(positionId, cluename, phone)
-		}*/
-		AssFail(positionId, cluename, phone)
+		//冻结处理
 		return clueId > -1 && uodateId1 > -1 && uodateId2 > -1 && uodateId3 > -1 && uodateId4 > -1 && uodateId5 > -1 && uodateId6 > -1
 	}) {
 		log.Println("线索分配成功")
@@ -508,7 +494,6 @@ func SaveClue0(item, userId, uId, top_cluetype, sub_cluetype, topname, subname,
 			"BCPCID":       common.GetRandom(32),
 			"operator_id":  -1,
 		})
-		AssFail(positionId, cluename, phone)
 		return clueId > -1 && uodateId1 > -1 && uodateId2 > -1 && uodateId3 > -1
 	}) {
 		log.Println("线索分配成功")