|
|
@@ -193,8 +193,10 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, result
|
|
|
starttime, _ = strconv.ParseInt(st, 0, 64)
|
|
|
et := strings.Split(spqp.SelectTime, "_")[1]
|
|
|
endtime, _ = strconv.ParseInt(et, 0, 64)
|
|
|
- etTime := time.Unix(endtime, 0)
|
|
|
- endtime = time.Date(etTime.Year(), etTime.Month(), etTime.Day(), 23, 59, 59, 0, time.Local).Unix()
|
|
|
+ if endtime > 0 {
|
|
|
+ etTime := time.Unix(endtime, 0)
|
|
|
+ endtime = time.Date(etTime.Year(), etTime.Month(), etTime.Day(), 23, 59, 59, 0, time.Local).Unix()
|
|
|
+ }
|
|
|
}
|
|
|
nowFormat := NowFormat(Date_Short_Layout)
|
|
|
start := (spqp.PageNum - 1) * pageSize
|
|
|
@@ -250,7 +252,7 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
|
|
|
querys := []string{fmt.Sprintf("userid='%s'", spqp.UserId)}
|
|
|
//时间
|
|
|
if starttime > 0 && endtime > 0 {
|
|
|
- querys = append(querys, fmt.Sprintf("date<=%d and date>=%d", starttime, endtime))
|
|
|
+ querys = append(querys, fmt.Sprintf("date>=%d and date<=%d", starttime, endtime))
|
|
|
} else if starttime > 0 && endtime == 0 {
|
|
|
querys = append(querys, fmt.Sprintf("date>=%d", starttime))
|
|
|
} else if starttime == 0 && endtime > 0 {
|
