Merge branch 'feature/cp-new' into feature/3.9.0

route/cp_r/anniversary.go

@@ -148,6 +148,10 @@ func PageAnniversary(c *gin.Context) (*mycontext.MyContext, error) {
 // 计算下一个纪念日
 func calcNextAnniversary(timestamp int64) int64 {
 	now := time.Now()
+	// 还没超过一天,不用计算明年的
+	if now.Unix()-timestamp < 86400 {
+		return timestamp
+	}
 	birthday := time.Unix(timestamp, 0)
 	// 计算今年的生日日期
 	thisYearBirthday := time.Date(now.Year(), birthday.Month(), birthday.Day(), birthday.Hour(), birthday.Minute(), birthday.Second(), 0, time.Local)