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

clueSync/autoTask.go

@@ -181,7 +181,7 @@ GROUP BY
 			clueId := common.Int64All(v["id"])
 			positionId := common.Int64All(v["position_id"])
 			seatNumber := common.ObjToString(v["seatNumber"])
-			if trailstatus == "03" {
+			if trailstatus == "01" {
 				//该线索最近一次分配给该电销人员后存在通话记录
 				uid := gconv.String(v["uid"])
 				phoneData := TiDb.FindOne("dwd_f_userbase_contacts", map[string]interface{}{

clueSync/kc.go

@@ -461,9 +461,12 @@ func ordersClue() {
 					}
 				}
 				is_assign := 1
+				mailContent := ""
 				cluename = common.ObjToString(v["company_name"])
+				mailContent = fmt.Sprintf("%s(%s)", cluename, user_phone)
 				if cluename == "" {
 					cluename = user_phone
+					mailContent = user_phone
 				}
 				if pay_money > 0 {
 					trailstatus = "08"
@@ -612,7 +615,7 @@ func ordersClue() {
 							//移交失败发送消息
 							if IsFreeze(source, pay_money, gconv.String(positionId)) {
 								//发送邮件信息
-								OrderCreateFail(positionId, cluename)
+								OrderCreateFail(positionId, mailContent)
 							}
 						}
 					}