Merge branch 'master' into feature/v1.5.16

telemarketingEtl/entity/dwd_f_userbase_visit_info.go

@@ -156,9 +156,10 @@ func VisitInfoAdd(start, end int64) {
 			config.JianyuMaindb.ExecBySql(`INSERT INTO bi_service.freeClubSign (mogUserId,act_again_date,create_time) VALUES (?,?,?) ON DUPLICATE KEY UPDATE act_again_date=?`, userid, nowFormat, nowFormat, nowFormat)
 		}
 		return true
-	}, `SELECT userid FROM dwd_f_userbase_visit_info a WHERE a.date>? AND a.date<? AND a.contentnum>=5 and not exists(
+	}, `select a.* from (SELECT userid FROM dwd_f_userbase_visit_info a WHERE a.date>? AND a.date<? AND a.contentnum>=5 and not exists(
 	select 1 from dwd_f_userbase_visit_info b where b.date>? and b.date<? and b.contentnum>=5 and a.userid=b.userid
-	) and not exists (SELECT 1 FROM dwd_f_data_equity_info b WHERE b.endtime>? and a.userid=b.userid)`, today, tomorrow, day30, today, nowFormat)
+	) and not exists (SELECT 1 FROM dwd_f_data_equity_info b WHERE b.endtime>? and a.userid=b.userid)) a
+	inner join dwd_f_userbase_baseinfo b on (a.userid=b.userid and b.l_registedate<?)`, today, tomorrow, day30, today, nowFormat, day30)
 	log.Println("更新不活跃重新活跃用户结束。。。")
 }