wip:tj

userSign/userAnalysis/jobFrontLogs.go

@@ -115,7 +115,7 @@ func (ua *UserAnalysis) GetBuryPointRes(ctx context.Context, runTime time.Time)
 		{"add_buyer_follow", "add_monitor_buyer_1_day", runTime.AddDate(0, 0, -1), runTime, 0, "近1天新增监控业主用户", false},
 		{"change_subscribe", "add_change_subscribe_1_day", runTime.AddDate(0, 0, -1), runTime, 0, "近1天调整订阅词用户", false},
 
-		{"jy_activities", "activity_A25142", runTime.AddDate(0, 0, -1), runTime, 0, "近1天调整订阅词用户", true},
+		{"jy_activities", "activity_A25142", runTime.AddDate(-1, 0, 0), runTime, 0, "近1天调整订阅词用户", true},
 	} {
 		if res := ua.getVisitStatic(ctx, item); res != nil {
 			fData = append(fData, res)

userSign/userAnalysis/telemarketing.go

@@ -99,17 +99,22 @@ func (ua *UserAnalysis) initFollowListen(ctx context.Context, t time.Time) []*An
 		}
 	}
 
-	res, err := g.DB("subjectdb").Query(ctx, "SELECT uid,id FROM dwd_f_crm_clue_info WHERE trail_time >? ", t.AddDate(0, 0, -30).Format(time.DateTime))
+	res, err := g.DB("subjectdb").Query(ctx, "SELECT uid,id,trail_time FROM dwd_f_crm_clue_info WHERE trail_time >? ", t.AddDate(0, 0, -30).Format(time.DateTime))
 	if err != nil {
 		g.Log().Errorf(ctx, "init follow listen err1:%v", err)
 	}
 	for _, m := range res.List() {
 		var (
-			userId = gconv.String(m["uid"])
-			id     = gconv.Int(m["id"])
+			userId  = gconv.String(m["uid"])
+			id      = gconv.Int(m["id"])
+			timeStr = gconv.String(m["trail_time"])
 		)
 		if baseUserId, ok := ua.TelemarketingBaseUserMap[userId]; ok {
 			followIdMapping[id] = baseUserId
+			follow30Day[baseUserId] = true
+			if t, err := time.ParseInLocation(time.DateTime, timeStr, time.Local); err == nil && t.After(seven) {
+				follow7Day[baseUserId] = true
+			}
 		}
 	}