Commit 5bd48b32 authored by hujiebin's avatar hujiebin

feat

parent 1b4382ea
......@@ -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])
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment