merge

clueSync/kc.go

@@ -19,26 +19,7 @@ import (
 
 func kcSync() {
 	log.Println("客户成功系统移交定时任务开始")
-<<<<<<< HEAD
-	//sql := `select * from dwd_f_userbase_order_info where pay_money > 0 and vip_endtime > "` + time.Now().Format(date.Date_Full_Layout) + `" and autoUpdate > "` + cfg.LastkcTime + `" order by autoUpdate asc`
-	sql := `SELECT
-	* 
-FROM
-	dwd_f_userbase_order_info 
-WHERE
-	uid in ("4b534cf8e67811ed972200163e3214c2","1928dfe0e69611ed972200163e3214c2","9949f6384e5511eebd3a00163e3214c2","9912accee69411ed972200163e3214c2","98de316406b011efbb0e00163e3214c2","d35a5734e69811ed972200163e3214c2","274e8eaae67b11ed972200163e3214c2","937f16bce69411ed972200163e3214c2","8cd465fac48e11eeb38300163e3214c2","a83cb826e68411ed972200163e3214c2","ed9f9ebce69111ed972200163e3214c2","b27abc84e69311ed972200163e3214c2","7e40357ce67d11ed972200163e3214c2","14e1a9d6e68b11ed972200163e3214c2","7ce2192ee69211ed972200163e3214c2","741f3ff2e68711ed972200163e3214c2","b54b3148e69111ed972200163e3214c2","6bd34a0e098811eeb04a00163e3214c2","62c887f0e69a11ed972200163e3214c2","47f24806e67911ed972200163e3214c2","b9929da2e69311ed972200163e3214c2","421a0dace69611ed972200163e3214c2","c9300b46e67011ed972200163e3214c2","0b01efc8e69711ed972200163e3214c2","c796378e05d111efaee600163e3214c2","47fe4f58e69611ed972200163e3214c2","5867d45a3d9811ee829800163e3214c2","c484486ce69a11ed972200163e3214c2","018261e2e67611ed972200163e3214c2","bace9eb8e69911ed972200163e3214c2","c292fc6ce67511ed972200163e3214c2","092c4d12e69011ed972200163e3214c2","49f7912ee67411ed972200163e3214c2","cbe2589ce68111ed972200163e3214c2")
-	AND pay_money > 0 
-	AND vip_endtime > now() 
-	AND product_type IN ( "大会员", "企业商机管理" ) 
-	AND order_status = 1 
-	AND data_spec != "dhy4" 
-	AND refund_status != 1 
-	AND vip_starttime != "2099-01-01 00:00:00"
-
-`
-=======
 	sql := `select * from dwd_f_userbase_order_info where payable_money > 0 and vip_endtime > "` + time.Now().Format(date.Date_Full_Layout) + `" and autoUpdate > "` + cfg.LastkcTime + `" order by autoUpdate asc`
->>>>>>> master
 	data := TiDb.SelectBySql(sql)
 	if data != nil && *data != nil && len(*data) > 0 {
 		for _, v := range *data {
@@ -48,16 +29,15 @@ WHERE
 			order_status := common.IntAll(v["order_status"])
 			refund_status := common.IntAll(v["refund_status"])
 			if (product_type == "大会员" || product_type == "企业商机管理") && order_status == 1 && data_spec != "dhy4" && !strings.HasPrefix(starttime, "2099") && refund_status != 1 {
-				kcJob(v)
-				//status := kcJob(v)
-				/*if status == 0 {
+				status := kcJob(v)
+				if status == 0 {
 					break
-				}*/
+				}
 			}
-			//cfg.LastkcTime = common.ObjToString(v["autoUpdate"])
+			cfg.LastkcTime = common.ObjToString(v["autoUpdate"])
 		}
 	}
-	//common.WriteSysConfig(&cfg)
+	common.WriteSysConfig(&cfg)
 	log.Println("客户成功系统移交定时任务结束")
 }