Merge branch 'dev_v1.5.36.6_wh' of jianyu/datatools into hotfix/v1.5.36.6

clueSync/config.go

@@ -39,6 +39,7 @@ type (
 		InviteTime              string  `json:"inviteTime"`
 		ActivityTime            string  `json:"activityTime"`
 		LastKcChangeTime        string  `json:"lastKcChangeTime"`
+		LastUserBindingTime     string  `json:"lastUserBindingTime"`
 	}
 	DB struct {
 		CornExp1      int64  `json:"cornexp1"`

clueSync/config.json

@@ -1 +1,29 @@
-{"lastOrderId":263906,"lastOrderClueId":"2025-06-13 17:47:39","lastUserId":"2025-06-19 09:35:02","lastXcxUserId":"2025-06-18 16:31:01","lastId":"684cef938a04a21118691ba3","lastOrderTime":"2025-04-21 10:41:30","lastUserTime":"2025-04-21 13:30:02","lastSubscribeId":"67fcb9c1cdf0004e40e69cba","lastMessageTime":"2025-05-29 11:16:13","lastMessageButtonTime":"2025-05-28 16:59:23","lastkcTime":"2025-06-07 11:39:31","lastEverythingTime":"2025-06-19 15:13:26","lastEventRegTime":"2024-11-20 13:40:21","lastReadClueTime":"2025-03-25 14:43:42","bigSaleTime":1747293636,"bigOrderTime":"2025-04-29 15:18:31","marketSaleTime":1745218148,"advisoryCommitteeTime":1745216244,"selectionDepartmentTime":1745216244,"allocationTime":"2024-11-20 13:40:21","allocationRatio":2,"activeTime":"2025-04-14 22:00:00","rebindTime":"2025-04-09 11:11:56","inviteTime":"2025-04-21 00:00:00","activityTime":"2025-04-03 16:59:23","lastKcChangeTime":"2025-04-14 15:00:27.000"}
+{
+  "lastOrderId": 263906,
+  "lastOrderClueId": "2025-06-13 17:47:39",
+  "lastUserId": "2025-06-19 09:35:02",
+  "lastXcxUserId": "2025-06-18 16:31:01",
+  "lastId": "684cef938a04a21118691ba3",
+  "lastOrderTime": "2025-04-21 10:41:30",
+  "lastUserTime": "2025-04-21 13:30:02",
+  "lastSubscribeId": "67fcb9c1cdf0004e40e69cba",
+  "lastMessageTime": "2025-05-29 11:16:13",
+  "lastMessageButtonTime": "2025-05-28 16:59:23",
+  "lastkcTime": "2025-06-07 11:39:31",
+  "lastEverythingTime": "2025-06-19 15:13:26",
+  "lastEventRegTime": "2024-11-20 13:40:21",
+  "lastReadClueTime": "2025-03-25 14:43:42",
+  "bigSaleTime": 1747293636,
+  "bigOrderTime": "2025-04-29 15:18:31",
+  "marketSaleTime": 1745218148,
+  "advisoryCommitteeTime": 1745216244,
+  "selectionDepartmentTime": 1745216244,
+  "allocationTime": "2024-11-20 13:40:21",
+  "allocationRatio": 2,
+  "activeTime": "2025-04-14 22:00:00",
+  "rebindTime": "2025-04-09 11:11:56",
+  "inviteTime": "2025-04-21 00:00:00",
+  "activityTime": "2025-04-03 16:59:23",
+  "lastKcChangeTime": "2025-04-14 15:00:27.000",
+  "lastUserBindingTime": "2025-04-21 00:00:00"
+}

clueSync/jobutil.go

@@ -769,7 +769,7 @@ func saleLeads() {
 func userbase() {
 	log.Println("userbase定时任务开始")
 	timeUnix := time.Now().Unix()
-	selectTimeStart := time.Unix(timeUnix-1800, 0).Format("2006-01-02 15:04:05")
+	selectTimeStart := cfg.LastUserBindingTime
 	selectTimeEnd := time.Unix(timeUnix, 0).Format("2006-01-02 15:04:05")
 	sql := fmt.Sprintf(`SELECT
 		a.phone,b.uid,a.baseinfo_id,b.l_registedate,a.createtime,b.id,b.userid,b.rsource
@@ -780,10 +780,9 @@ func userbase() {
 	    and  (b.s_platform != 'xcx' or  b.s_sourceid='jyzbw' or  b.s_platform is  NULL)
 		AND a.phone = b.phone and a.baseinfo_id= b.uid and     b.source  ="0101"
   		and  a.phone  is  not   NULL  
-		and   a.createtime   >="%s"
-		and   a.createtime   <"%s"
+		and   a.createtime   >"%s"
 		and  a.is_delete=1  
-		ORDER BY    a.createtime `, selectTimeStart, selectTimeEnd)
+		ORDER BY    a.createtime `, selectTimeStart)
 	data := TiDb.SelectBySql(sql)
 	if data != nil && *data != nil && len(*data) > 0 {
 		for _, v := range *data {
@@ -799,10 +798,12 @@ func userbase() {
 				})
 			}
 			registedate := common.ObjToString(v["l_registedate"])
+
 			name := common.ObjToString(v["name"])
 			nowTime := time.Now().Format(date.Date_Full_Layout)
 			layout := "2006-01-02 15:04:05"
 			createtime := gconv.String(v["createtime"])
+			cfg.LastUserBindingTime = createtime
 			createtimeInt64, _ := time.Parse(layout, createtime)
 			registedateInt64, _ := time.Parse(layout, registedate)
 			count := TiDb.CountBySql("select count(1) as count from dwd_f_crm_clue_info where uid = ?", uId)
@@ -883,6 +884,7 @@ func userbase() {
 			}
 		}
 	}
+	common.WriteSysConfig(&cfg)
 	log.Println("userbase定时任务结束")
 }