|
@@ -356,7 +356,7 @@ 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()
|
|
endtime = time.Date(etTime.Year(), etTime.Month(), etTime.Day(), 23, 59, 59, 0, time.Local).Unix()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- } else if spqp.SelectTime != "" {
|
|
|
|
|
|
|
+ } else if spqp.SelectTime != "" { //wx推送跳转过来
|
|
|
starttime, _ = strconv.ParseInt(spqp.SelectTime, 0, 64)
|
|
starttime, _ = strconv.ParseInt(spqp.SelectTime, 0, 64)
|
|
|
endtime = starttime
|
|
endtime = starttime
|
|
|
}
|
|
}
|
|
@@ -372,8 +372,8 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam, bsp *ViewCondition) (hasN
|
|
|
nowFormat := date.NowFormat(date.Date_Short_Layout)
|
|
nowFormat := date.NowFormat(date.Date_Short_Layout)
|
|
|
start := (spqp.PageNum - 1) * spqp.PageSize
|
|
start := (spqp.PageNum - 1) * spqp.PageSize
|
|
|
end := start + spqp.PageSize
|
|
end := start + spqp.PageSize
|
|
|
- //时间是今天，没有别的过滤条件--首先读取当前推送缓存数据 其次查询数据库
|
|
|
|
|
- if nowFormat == date.FormatDateByInt64(&starttime, date.Date_Short_Layout) && spqp.Area == "" && spqp.City == "" && spqp.District == "" && spqp.Buyerclass == "" && spqp.Subscopeclass == "" && spqp.Subtype == "" && spqp.Key == "" && spqp.Item == "" && spqp.Price == "" && spqp.FileExists == "" && len(spqp.Staffs) == 0 && spqp.Source == "" && spqp.IsRead == "" && len(spqp.SelectInfoIds) == 0 {
|
|
|
|
|
|
|
+ //时间是今天，没有别的过滤条件--首先读取当前推送缓存数据 其次查询数据库 过滤wx订阅推送跳转用户starttime != endtime
|
|
|
|
|
+ if nowFormat == date.FormatDateByInt64(&starttime, date.Date_Short_Layout) && starttime != endtime && spqp.Area == "" && spqp.City == "" && spqp.District == "" && spqp.Buyerclass == "" && spqp.Subscopeclass == "" && spqp.Subtype == "" && spqp.Key == "" && spqp.Item == "" && spqp.Price == "" && spqp.FileExists == "" && len(spqp.Staffs) == 0 && spqp.Source == "" && spqp.IsRead == "" && len(spqp.SelectInfoIds) == 0 {
|
|
|
subPush := &SubPush{}
|
|
subPush := &SubPush{}
|
|
|
var err error
|
|
var err error
|
|
|
if spqp.IsEnt == false {
|
|
if spqp.IsEnt == false {
|
