Browse Source

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

王浩 5 months ago
parent
commit
3a150a282e
1 changed files with 1 additions and 4 deletions
  1. 1 4
      clueSync/kc.go

+ 1 - 4
clueSync/kc.go

@@ -842,7 +842,6 @@ func refundAuto() {
 									"remrk":        "1天后即将移交",
 									"reason":       "成交客户续费失败",
 								})
-<<<<<<< HEAD
 								salesEmailData[saleId] = append(salesEmailData[saleId], map[string]interface{}{
 									"company_name": company_name,
 									"phone":        phone,
@@ -852,8 +851,6 @@ func refundAuto() {
 									"cluename":     cluename,
 								})
 								isOk = true
-=======
->>>>>>> master
 							} else if time.Now().Unix()-vip_endtimes.Unix() < db.HandoverCycle*86400 {
 								isOk = true
 							}
@@ -1016,7 +1013,7 @@ func refundAuto() {
 		}
 		return true
 	}, `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 clue_id =1651388`)
+	//}, `select ent_id,clue_id,position_id,name,is_renewal_protection,company_name from dwd_f_csm_customer_info where clue_id =1590274`)
 
 	//移交电销提醒
 	for i, v := range mailData {