记得上下班打卡 | 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
46003f2b
Commit
46003f2b
authored
Oct 12, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:会员订单列表排序;
fix:会员续费updated_at;
parent
90e7e870
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+6
-5
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 @
46003f2b
...
...
@@ -29,10 +29,7 @@ import org.springframework.util.StringUtils;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
import
java.util.stream.Collectors
;
@Slf4j
...
...
@@ -262,6 +259,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
updateExistUserMemberVo
.
setState
(
1
);
updateExistUserMemberVo
.
setExpiryAt
(
expiryAt
);
updateExistUserMemberVo
.
setUpdatedAt
(
now
);
long
s
=
System
.
currentTimeMillis
();
adamRdmService
.
setUserMemberVoByUid
(
handleMemberOrderVo
.
getUid
(),
updateExistUserMemberVo
);
log
.
debug
(
"#RDS耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
...
...
@@ -471,6 +469,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
(
expiryAt
.
isBefore
(
now
)
?
now
:
expiryAt
).
plusDays
(
initMemberOrderVo
.
getDays
())
.
withHour
(
23
).
withMinute
(
59
).
withSecond
(
59
)
);
updateExistUserMemberVo
.
setUpdatedAt
(
now
);
toMqSqls
.
add
(
SqlMapping
.
get
(
"adam_user_member.update"
));
upsertUserMemberObjs
.
add
(
new
Object
[]{
updateExistUserMemberVo
.
getState
(),
updateExistUserMemberVo
.
getExpiryAt
(),
now
,
updateExistUserMemberVo
.
getUid
()
...
...
@@ -567,7 +566,9 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
orderVos
.
forEach
(
r
->
vos
.
add
(
AdamMemberOrderSimpleVo
.
getNew
().
copy
(
r
)));
pagedResult
.
setTotal
(
orderVos
.
size
(),
20
);
vos
.
sort
(
Comparator
.
comparing
(
AdamMemberOrderSimpleVo:
:
getCreatedAt
).
reversed
());
pagedResult
.
setTotal
(
orderVos
.
size
(),
40
);
pagedResult
.
setList
(
vos
);
}
...
...
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