|
@@ -319,7 +319,7 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam) (hasNextPage bool, total
|
|
|
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.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 {
|
|
|
|
|
|
|
+ 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 {
|
|
|
subPush := &SubPush{}
|
|
subPush := &SubPush{}
|
|
|
var err error
|
|
var err error
|
|
|
if spqp.IsEnt == false {
|
|
if spqp.IsEnt == false {
|
|
@@ -1211,7 +1211,7 @@ func (s *subscribePush) getDefaultDatasSQL(bsp *ViewCondition) (str string) {
|
|
|
bools := []string{}
|
|
bools := []string{}
|
|
|
musts := []string{}
|
|
musts := []string{}
|
|
|
//发布时间最新7天(正式环境需要修改)
|
|
//发布时间最新7天(正式环境需要修改)
|
|
|
- musts = append(musts, fmt.Sprintf(bidTime, time.Now().AddDate(0, 0, -7).Unix()))
|
|
|
|
|
|
|
+ musts = append(musts, fmt.Sprintf(bidTime, time.Now().AddDate(-7, 0, -7).Unix()))
|
|
|
//省份
|
|
//省份
|
|
|
areaCity := []string{}
|
|
areaCity := []string{}
|
|
|
if len(bsp.Area) > 0 {
|
|
if len(bsp.Area) > 0 {
|
WH01243