|
@@ -3,7 +3,6 @@ package model
|
|
|
import (
|
|
|
"encoding/json"
|
|
|
"fmt"
|
|
|
- "github.com/gogf/gf/v2/util/gconv"
|
|
|
IC "jyBXSubscribe/rpc/init"
|
|
|
ms "jyBXSubscribe/rpc/model/service"
|
|
|
"jyBXSubscribe/rpc/type/bxsubscribe"
|
|
@@ -14,6 +13,8 @@ import (
|
|
|
"sync"
|
|
|
"time"
|
|
|
|
|
|
+ "github.com/gogf/gf/v2/util/gconv"
|
|
|
+
|
|
|
"app.yhyue.com/moapp/jybase/common"
|
|
|
"app.yhyue.com/moapp/jybase/date"
|
|
|
"app.yhyue.com/moapp/jybase/encrypt"
|
|
@@ -440,6 +441,8 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
|
|
|
querys = append(querys, fmt.Sprintf(" a.date>=%d", starttime))
|
|
|
} else if starttime == 0 && endtime > 0 {
|
|
|
querys = append(querys, fmt.Sprintf(" a.date<=%d", endtime))
|
|
|
+ } else {
|
|
|
+ querys = append(querys, " a.date>0")
|
|
|
}
|
|
|
var regionArr = []string{}
|
|
|
if spqp.Area != "" || spqp.City != "" || spqp.District != "" {
|