|
@@ -291,7 +291,7 @@ var (
|
|
|
mDetailMap = make(map[string]int)
|
|
|
)
|
|
|
|
|
|
-func Count3DaysSearch() {
|
|
|
+func Count30DaysSearch() {
|
|
|
var (
|
|
|
sql string
|
|
|
countSql string
|
|
@@ -312,8 +312,8 @@ func Count3DaysSearch() {
|
|
|
if firstLoad2 {
|
|
|
// 当日首次执行 1、全部归0 search_count
|
|
|
config.JianyuSubjectdb.ExecBySql("UPDATE dwd_f_crm_attribute_label SET search_count = 0")
|
|
|
- sql = "SELECT v.userid, b.uid, v.search_time FROM dwd_f_userbase_search_info v LEFT JOIN dwd_f_userbase_baseinfo b ON v.userid = b.userid WHERE DATE(v.search_time) BETWEEN DATE(NOW() - INTERVAL 3 DAY) AND DATE(NOW()) ORDER BY v.search_time ASC"
|
|
|
- countSql = "SELECT COUNT(v.id) FROM dwd_f_userbase_search_info v WHERE DATE(v.search_time) BETWEEN DATE(NOW() - INTERVAL 3 DAY) AND DATE(NOW())"
|
|
|
+ sql = "SELECT v.userid, b.uid, v.search_time FROM dwd_f_userbase_search_info v LEFT JOIN dwd_f_userbase_baseinfo b ON v.userid = b.userid WHERE DATE(v.search_time) BETWEEN DATE(NOW() - INTERVAL 30 DAY) AND DATE(NOW()) ORDER BY v.search_time ASC"
|
|
|
+ countSql = "SELECT COUNT(v.id) FROM dwd_f_userbase_search_info v WHERE DATE(v.search_time) BETWEEN DATE(NOW() - INTERVAL 30 DAY) AND DATE(NOW())"
|
|
|
} else {
|
|
|
aTime := time.Now().Add(-1 * time.Hour)
|
|
|
sql = fmt.Sprintf("SELECT v.userid, b.uid, v.search_time FROM dwd_f_userbase_search_info v LEFT JOIN dwd_f_userbase_baseinfo b ON v.userid = b.userid WHERE v.search_time >= '%s' ORDER BY v.search_time ASC", aTime.Format(time.DateTime))
|
|
@@ -372,7 +372,7 @@ func Count3DaysSearch() {
|
|
|
mSearchMap = make(map[string]int)
|
|
|
}
|
|
|
|
|
|
-func Count3DaysDetail() {
|
|
|
+func Count30DaysDetail() {
|
|
|
var (
|
|
|
sql string
|
|
|
countSql string
|
|
@@ -393,8 +393,8 @@ func Count3DaysDetail() {
|
|
|
if firstLoad3 {
|
|
|
// 当日首次执行 1、全部归0 click_detail_count
|
|
|
config.JianyuSubjectdb.ExecBySql("UPDATE dwd_f_crm_attribute_label SET click_detail_count = 0")
|
|
|
- sql = "SELECT v.userid, b.uid, v.date, v.contentnum FROM dwd_f_userbase_visit_info v LEFT JOIN dwd_f_userbase_baseinfo b ON v.userid = b.userid WHERE DATE(v.date) BETWEEN DATE(NOW() - INTERVAL 3 DAY) AND DATE(NOW()) ORDER BY v.date ASC"
|
|
|
- countSql = "SELECT COUNT(v.id) FROM dwd_f_userbase_visit_info v WHERE DATE(date) BETWEEN DATE(NOW() - INTERVAL 3 DAY) AND DATE(NOW())"
|
|
|
+ sql = "SELECT v.userid, b.uid, v.date, v.contentnum FROM dwd_f_userbase_visit_info v LEFT JOIN dwd_f_userbase_baseinfo b ON v.userid = b.userid WHERE DATE(v.date) BETWEEN DATE(NOW() - INTERVAL 30 DAY) AND DATE(NOW()) ORDER BY v.date ASC"
|
|
|
+ countSql = "SELECT COUNT(v.id) FROM dwd_f_userbase_visit_info v WHERE DATE(date) BETWEEN DATE(NOW() - INTERVAL 30 DAY) AND DATE(NOW())"
|
|
|
} else {
|
|
|
aTime := time.Now().Add(-1 * time.Hour)
|
|
|
sql = fmt.Sprintf("SELECT v.userid, b.uid, v.date, v.contentnum FROM dwd_f_userbase_visit_info v LEFT JOIN dwd_f_userbase_baseinfo b ON v.userid = b.userid WHERE v.date >= '%s' ORDER BY v.date ASC", aTime.Format(time.DateTime))
|