|
|
@@ -356,6 +356,9 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam, bsp *ViewCondition) (hasN
|
|
|
endtime = time.Date(etTime.Year(), etTime.Month(), etTime.Day(), 23, 59, 59, 0, time.Local).Unix()
|
|
|
}
|
|
|
}
|
|
|
+ } else if spqp.SelectTime != "" {
|
|
|
+ starttime, _ = strconv.ParseInt(spqp.SelectTime, 0, 64)
|
|
|
+ endtime = starttime
|
|
|
}
|
|
|
//不活跃用户处理
|
|
|
if spqp.UserType == "fType" && spqp.PositionType == 0 && spqp.SubPushInactive == 1 {
|
|
|
@@ -511,6 +514,9 @@ func (s *subscribePush) inactiveQuery(spqp *SubPushQueryParam, bsp *ViewConditio
|
|
|
endtime = time.Now().AddDate(0, 0, -15).Unix()
|
|
|
}
|
|
|
}
|
|
|
+ } else if spqp.SelectTime != "" {
|
|
|
+ starttime, _ = strconv.ParseInt(spqp.SelectTime, 0, 64)
|
|
|
+ endtime = starttime
|
|
|
} else {
|
|
|
starttime = time.Now().AddDate(0, 0, -15).Unix()
|
|
|
endtime = time.Now().Unix()
|
