Commit d96a06e0 authored by hujiebin's avatar hujiebin

Merge branch 'feature/3.9.0-fix' into 'master'

Feature/3.9.0 fix

See merge request !5
parents dc465373 07d5f92c
...@@ -176,13 +176,9 @@ func UpdateCpAnniversaryReminded(model *domain.Model, id mysql.ID) error { ...@@ -176,13 +176,9 @@ func UpdateCpAnniversaryReminded(model *domain.Model, id mysql.ID) error {
// 计算下一个纪念日 // 计算下一个纪念日
func CalcNextAnniversary(timestamp int64) int64 { func CalcNextAnniversary(timestamp int64) int64 {
now := time.Now() now := time.Now()
// 还没超过一天,不用计算明年的
if now.Unix()-timestamp < 86400 {
return timestamp
}
birthday := time.Unix(timestamp, 0) birthday := time.Unix(timestamp, 0)
// 计算今年的生日日期 // 计算今年的生日日期
thisYearBirthday := time.Date(now.Year(), birthday.Month(), birthday.Day(), birthday.Hour(), birthday.Minute(), birthday.Second(), 0, time.Local) thisYearBirthday := time.Date(now.Year(), birthday.Month(), birthday.Day(), 0, 0, 0, 0, time.Local)
// 如果今年的生日还未到,则生日日期为今年的生日日期;否则为明年的生日日期 // 如果今年的生日还未到,则生日日期为今年的生日日期;否则为明年的生日日期
var next time.Time var next time.Time
......
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