Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hilo-user
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenweijian
hilo-user
Commits
d96a06e0
Commit
d96a06e0
authored
Jun 17, 2023
by
hujiebin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/3.9.0-fix' into 'master'
Feature/3.9.0 fix See merge request
!5
parents
dc465373
07d5f92c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
anniversary.go
domain/model/cp_m/anniversary.go
+1
-5
No files found.
domain/model/cp_m/anniversary.go
View file @
d96a06e0
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment