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

clueSync/job.go

@@ -882,6 +882,7 @@ func WorkUpdateClue(data map[string]interface{}, saleData []map[string]interface
 		//线索
 		ok = TiDb.UpdateByTx(tx, "dwd_f_crm_clue_info", map[string]interface{}{"uid": uId}, clueUpdateData)
 		//变更记录
+
 		if (trailstatus == "00" || old_position_id == 0 || (pIsOk && old_cluename != cluename && cluename != "")) && is_assign == 1 {
 			if trailstatus == "00" && trailstatusTime != "" && time.Now().Unix()-trailstatusTimes.Unix() < 86400 {
 			} else if old_position_id == 0 {
@@ -1091,9 +1092,20 @@ func WorkUpdateClue(data map[string]interface{}, saleData []map[string]interface
 						}
 					}
 
+				} else if gconv.Int64(clueUpdateData["is_task"]) == 1 && !is_ok {
+					updateId5 = TiDb.InsertByTx(tx, "dwd_f_crm_clue_change_record", map[string]interface{}{
+						"clue_id":     clueId,
+						"position_id": common.If(trailstatus == "00" || is_assign == 0 || is_assign == -1, positionId, common.Int64All(data["position_id"])),
+						"change_type": "加入任务车",
+						"new_value":   gconv.String(common.If(gconv.Int64(data["position_id"]) == 0, "线索自动分配", "线索来源自动更新")) + "-" + topname + "-" + subname,
+						"createtime":  nowTime,
+						"BCPCID":      common.GetRandom(32),
+						"operator_id": -1,
+					})
 				}
 			}
 		}
+
 		if old_top_cluetype != "" {
 			pcodeData := TiDb.FindOne("dwd_d_crm_cluetype_code", map[string]interface{}{"code": old_top_cluetype}, "", "")
 			if pcodeData != nil && len(*pcodeData) > 0 {
@@ -1655,7 +1667,7 @@ func UpdateClue(data map[string]interface{}, saleData []map[string]interface{},
 							})
 						}
 					}
-				} else if gconv.Int64(clueUpdateData["is_task"]) == 1 {
+				} else if gconv.Int64(clueUpdateData["is_task"]) == 1 && !is_ok {
 					updateId5 = TiDb.InsertByTx(tx, "dwd_f_crm_clue_change_record", map[string]interface{}{
 						"clue_id":     clueId,
 						"position_id": common.If(trailstatus == "00" || is_assign == 0 || is_assign == -1, positionId, common.Int64All(data["position_id"])),

clueSync/jobutil.go

@@ -1159,8 +1159,8 @@ func autoDraw(mode, cluename, phone string, isGroup, isCommerce int) (positionId
 					positionId = common.Int64All((*cdata)[0]["position_id"])
 					noticePositionId = positionId
 					seatNumber = common.ObjToString((*cdata)[0]["seatNumber"])
-					assign_type := common.IntAll(v["assign_type"])
-					role_id := common.IntAll(v["role_id"])
+					assign_type := common.IntAll((*cdata)[0]["assign_type"])
+					role_id := common.IntAll((*cdata)[0]["role_id"])
 					for _, v := range *pdata {
 						resign := common.IntAll(v["resign"])
 						if positionId == common.Int64All(v["position_id"]) {