Pārlūkot izejas kodu

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

王浩 6 mēneši atpakaļ
vecāks
revīzija
e05ad16c70
2 mainītis faili ar 6 papildinājumiem un 3 dzēšanām
  1. 3 0
      clueSync/autoTask.go
  2. 3 3
      clueSync/kc.go

+ 3 - 0
clueSync/autoTask.go

@@ -622,6 +622,9 @@ func ClueToDxTask() {
 			}
 		} else { //企业大会员
 			//根据企业id查询企业下的员工
+			if gconv.Int(val["ent_id"]) == 0 {
+				continue
+			}
 			data := TiDb.Query("SELECT userid,uid FROM dwd_f_userbase_id_mapping WHERE ent_id = ?", gconv.Int(val["ent_id"]))
 			if data != nil && len(*data) > 0 {
 				log.Println("企业下员工数:", gconv.Int(val["ent_id"]), len(*data))

+ 3 - 3
clueSync/kc.go

@@ -896,8 +896,8 @@ func refundAuto() {
 			}
 		}
 		return true
-	}, `select ent_id,clue_id,position_id,name,is_renewal_protection from dwd_f_csm_customer_info where is_transfer = 0`)
-	//}, `select ent_id,clue_id,position_id,name,is_renewal_protection from dwd_f_csm_customer_info where id =150022`)
+	}, `select ent_id,clue_id,position_id,name,is_renewal_protection,company_name from dwd_f_csm_customer_info where is_transfer = 0`)
+	//}, `select ent_id,clue_id,position_id,name,is_renewal_protection,company_name from dwd_f_csm_customer_info where id =180007`)
 	//移交电销提醒
 	for i, v := range mailData {
 		if i != "" {
@@ -1158,7 +1158,7 @@ func ExitKcSend(personName string, infoList []map[string]interface{}) {
 			//正文拼接
 			startStr := `<html lang="zh-CN"><head><meta charset="UTF-8"><meta name="viewport"content="width=device-width, initial-scale=1.0"><style>table{width:100%;border-collapse:collapse}th,td{border:1px solid#000;padding:8px;text-align:left}th{background-color:#f2f2f2}</style></head><body><p>以下客户已从或即将从客成系统退出,并移交销售跟进,请收悉,客户明细如下:</p><table><thead><tr><th>序号</th><th>公司名称</th><th>联系人</th><th>姓名</th><th>移交状态</th><th>移交销售原因</th></tr></thead><tbody>`
 			for i, v := range infoList {
-				startStr += fmt.Sprintf(`<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>`, i+1, gconv.String(v["company_name"]), gconv.String(v["phone"]), gconv.String(v["name"]), gconv.String(v["remrk"]), gconv.String(v["reason"]))
+				startStr += fmt.Sprintf(`<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>`, i+1, gconv.String(v["company_name"]), gconv.String(v["phone"]), gconv.String(v["userName"]), gconv.String(v["remrk"]), gconv.String(v["reason"]))
 			}
 			endStr := `</tbody></table><p></body></html>`
 			startStr += endStr