From 5bd48b32277282983f0e1a5fe557095a7ae7ad0d Mon Sep 17 00:00:00 2001 From: hujiebin Date: Fri, 16 Jun 2023 15:20:26 +0800 Subject: [PATCH] feat --- domain/model/cp_m/anniversary.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/domain/model/cp_m/anniversary.go b/domain/model/cp_m/anniversary.go index 1f6071d..69613da 100644 --- a/domain/model/cp_m/anniversary.go +++ b/domain/model/cp_m/anniversary.go @@ -113,6 +113,7 @@ func GetAllCpAnniversary(model *domain.Model, userId mysql.ID) []CpAnniversary { func GetNeedRemindCpAnniversary(model *domain.Model) []CpAnniversary { var rows, res []CpAnniversary if err := model.DB().Model(CpAnniversary{}). + Where("`timestamp` > 0"). Where("`timestamp` < ?", time.Now().Unix()). Where("is_remind = 1"). Where("last_remind_time < ?", time.Now().AddDate(-1, 0, 0).Unix()). // 一年前提醒过 @@ -122,7 +123,7 @@ func GetNeedRemindCpAnniversary(model *domain.Model) []CpAnniversary { now := time.Now().Unix() for i, v := range rows { ts := CalcNextAnniversary(v.Timestamp) - if now > ts && now-ts <= 86400 { + if now > ts { res = append(res, rows[i]) } } @@ -133,6 +134,7 @@ func GetNeedRemindCpAnniversary(model *domain.Model) []CpAnniversary { func GetUserTodayCpAnniversary(model *domain.Model, cpId mysql.ID) []CpAnniversary { var rows, res []CpAnniversary if err := model.DB().Model(CpAnniversary{}). + Where("`timestamp` > 0"). Where("`timestamp` < ?", time.Now().Unix()). Where("is_remind = 1"). Where("cp_id = ?", cpId). @@ -142,7 +144,7 @@ func GetUserTodayCpAnniversary(model *domain.Model, cpId mysql.ID) []CpAnniversa now := time.Now().Unix() for i, v := range rows { ts := CalcNextAnniversary(v.Timestamp) - if now > ts && now-ts <= 86400 { + if now > ts { res = append(res, rows[i]) } } -- 2.22.0