记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
董敬伟
liquidnet-bus-v1
Commits
9c918b55
Commit
9c918b55
authored
Aug 13, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复会员过期时间记录23:59:59.999,数据库存储为次日00:00:00问题;
parent
2df6cdf3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+6
-4
No files found.
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
9c918b55
...
...
@@ -229,7 +229,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
initUserMemberVo
.
setMemberId
(
handleMemberOrderVo
.
getMemberId
());
initUserMemberVo
.
setMemberNo
(
memberNo
);
initUserMemberVo
.
setState
(
1
);
// 1-正常,2-失效
initUserMemberVo
.
setExpiryAt
(
now
.
plusDays
(
memberPriceVo
.
getDays
()).
with
(
LocalTime
.
MAX
));
initUserMemberVo
.
setExpiryAt
(
now
.
plusDays
(
memberPriceVo
.
getDays
()).
with
Hour
(
23
).
withMinute
(
59
).
withSecond
(
59
));
initUserMemberVo
.
setCreatedAt
(
now
);
long
s
=
System
.
currentTimeMillis
();
...
...
@@ -247,7 +247,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
AdamUserMemberVo
updateExistUserMemberVo
=
AdamUserMemberVo
.
getNew
();
BeanUtils
.
copyProperties
(
existUserMemberVo
,
updateExistUserMemberVo
);
LocalDateTime
currentExpiryAt
=
existUserMemberVo
.
getExpiryAt
();
LocalDateTime
expiryAt
=
(
currentExpiryAt
.
isBefore
(
now
)
?
now
:
currentExpiryAt
).
plusDays
(
memberPriceVo
.
getDays
()).
with
(
LocalTime
.
MAX
);
LocalDateTime
expiryAt
=
(
currentExpiryAt
.
isBefore
(
now
)
?
now
:
currentExpiryAt
)
.
plusDays
(
memberPriceVo
.
getDays
()).
withHour
(
23
).
withMinute
(
59
).
withSecond
(
59
);
updateExistUserMemberVo
.
setState
(
1
);
updateExistUserMemberVo
.
setExpiryAt
(
expiryAt
);
...
...
@@ -419,7 +420,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
updateExistUserMemberVo
.
setState
(
1
);
LocalDateTime
expiryAt
=
existUserMemberVo
.
getExpiryAt
();
updateExistUserMemberVo
.
setExpiryAt
(
(
expiryAt
.
isBefore
(
now
)
?
now
:
expiryAt
).
plusDays
(
initMemberOrderVo
.
getDays
()).
with
(
LocalTime
.
MAX
)
(
expiryAt
.
isBefore
(
now
)
?
now
:
expiryAt
).
plusDays
(
initMemberOrderVo
.
getDays
())
.
withHour
(
23
).
withMinute
(
59
).
withSecond
(
59
)
);
toMqSqls
.
add
(
SqlMapping
.
get
(
"adam_user_member.update"
));
upsertUserMemberObjs
.
add
(
new
Object
[]{
...
...
@@ -432,7 +434,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
initUserMemberVo
.
setMemberId
(
memberCodeVo
.
getMemberId
());
initUserMemberVo
.
setMemberNo
(
memberCodeVo
.
getMemberNo
());
initUserMemberVo
.
setState
(
1
);
initUserMemberVo
.
setExpiryAt
(
now
.
plusDays
(
initMemberOrderVo
.
getDays
()).
with
(
LocalTime
.
MAX
));
initUserMemberVo
.
setExpiryAt
(
now
.
plusDays
(
initMemberOrderVo
.
getDays
()).
with
Hour
(
23
).
withMinute
(
59
).
withSecond
(
59
));
initUserMemberVo
.
setCreatedAt
(
now
);
toMqSqls
.
add
(
SqlMapping
.
get
(
"adam_user_member.add"
));
...
...
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