|
@@ -7,7 +7,7 @@ import (
|
|
|
"github.com/go-xweb/xweb"
|
|
|
"log"
|
|
|
"qfw/util/redis"
|
|
|
- "strconv"
|
|
|
+ "strings"
|
|
|
"time"
|
|
|
"util"
|
|
|
)
|
|
@@ -74,23 +74,22 @@ func adHandle(data []interface{}) []adInfo {
|
|
|
return res
|
|
|
}
|
|
|
json.Unmarshal(bytes, &adInfo_Arr)
|
|
|
- log.Println(adInfo_Arr)
|
|
|
if len(adInfo_Arr) > 0 {
|
|
|
now := time.Now()
|
|
|
for _, v := range adInfo_Arr {
|
|
|
- if v.O_extend.StartTime != "" {
|
|
|
- if thisTime, err := strconv.ParseInt(v.O_extend.StartTime, 10, 64); err == nil {
|
|
|
+ if v.O_extend.StartTime != "" && len(strings.Split(v.O_extend.StartTime, "-")) == 6 {
|
|
|
+ if thisTime, err := time.ParseInLocation("2006-01-02-15-04-05", v.O_extend.StartTime, time.Local); err == nil {
|
|
|
//广告还未开始
|
|
|
- if thisTime > now.Unix() {
|
|
|
- break
|
|
|
+ if thisTime.Unix() > now.Unix() {
|
|
|
+ continue
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if v.O_extend.EndTime != "" {
|
|
|
- if thisTime, err := strconv.ParseInt(v.O_extend.EndTime, 10, 64); err == nil {
|
|
|
+ if v.O_extend.EndTime != "" && len(strings.Split(v.O_extend.EndTime, "-")) == 6 {
|
|
|
+ if thisTime, err := time.ParseInLocation("2006-01-02-15-04-05", v.O_extend.EndTime, time.Local); err == nil {
|
|
|
//广告已经结束
|
|
|
- if thisTime < now.Unix() {
|
|
|
- break
|
|
|
+ if thisTime.Unix() < now.Unix() {
|
|
|
+ continue
|
|
|
}
|
|
|
}
|
|
|
}
|