Merge branch 'feature/v2.9.27_wky' of jianyu/ent_new into feature/v2.9.27

behavior/src/timetask/userbehavior.go

@@ -250,7 +250,7 @@ func GetPushDates(entUserId []string, startTime, endTime int64) map[string]*push
 		return nil
 	}
 	//
-	res := Base.SelectBySql(fmt.Sprintf(`SELECT userid, sum( total ) AS 'total', sum( visit ) AS 'visit' FROM (  (  SELECT  userid,  0 AS visit ,  sum( 1 ) AS total  FROM  pushentniche  WHERE  userid IN ( %s )  AND DATE >= ?  AND DATE < ?  GROUP BY  userid  ) UNION  (  SELECT  userid,  sum( isvisit ) AS visit,  0 AS total  FROM  pushentniche  WHERE  userid IN ( %s )  AND visittime >= ?  AND visittime < ?  GROUP BY  userid  ) ) allData GROUP BY allData.userid`, strings.Join(entUserId, ","), strings.Join(entUserId, ",")), startTime, endTime, time.Unix(startTime, 0).Format(date.Date_Full_Layout), time.Unix(endTime, 0).Format(date.Date_Full_Layout))
+	res := Base.SelectBySql(fmt.Sprintf(`SELECT userid, sum( total ) AS 'total', sum( visit ) AS 'visit' FROM (  (  SELECT  userid,  0 AS visit ,  sum( 1 ) AS total  FROM  push.pushentniche  WHERE  userid IN ( %s )  AND DATE >= ?  AND DATE < ?  GROUP BY  userid  ) UNION  (  SELECT  userid,  sum( isvisit ) AS visit,  0 AS total  FROM  push.pushentniche  WHERE  userid IN ( %s )  AND visittime >= ?  AND visittime < ?  GROUP BY  userid  ) ) allData GROUP BY allData.userid`, strings.Join(entUserId, ","), strings.Join(entUserId, ",")), startTime, endTime, time.Unix(startTime, 0).Format(date.Date_Full_Layout), time.Unix(endTime, 0).Format(date.Date_Full_Layout))
 	if res == nil || len(*res) == 0 {
 		return nil
 	}