Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
2952a647
Commit
2952a647
authored
Aug 13, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改租車訂單地址,修改车辆预定时添加订单号
parent
0cc595ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
BackStageOrderController.java
...om/xxfc/platform/order/rest/BackStageOrderController.java
+2
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @
2952a647
...
@@ -100,12 +100,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
...
@@ -100,12 +100,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
Map
<
Integer
,
String
>
usernameMap
=
new
HashMap
<
Integer
,
String
>();
Map
<
Integer
,
String
>
usernameMap
=
new
HashMap
<
Integer
,
String
>();
Map
<
Integer
,
String
>
nicknameMap
=
new
HashMap
<
Integer
,
String
>();
Map
<
Integer
,
String
>
nicknameMap
=
new
HashMap
<
Integer
,
String
>();
if
(
objectRestResponse
.
getData
()
!=
null
)
{
if
(
objectRestResponse
.
getData
()
!=
null
)
{
usernameMap
=
objectRestResponse
.
getData
().
stream
()
usernameMap
=
objectRestResponse
.
getData
().
stream
()
.
filter
(
a
->
a
==
null
)
.
sorted
(
Comparator
.
comparing
(
AppUserVo:
:
getUserid
).
reversed
())
.
sorted
(
Comparator
.
comparing
(
AppUserVo:
:
getUserid
).
reversed
())
.
collect
(
Collectors
.
toMap
(
AppUserVo:
:
getUserid
,
AppUserVo:
:
getUsername
,
.
collect
(
Collectors
.
toMap
(
AppUserVo:
:
getUserid
,
AppUserVo:
:
getUsername
,
(
oldValue
,
newValue
)
->
newValue
,
// 如果有相同的key,使用新key
(
oldValue
,
newValue
)
->
newValue
,
// 如果有相同的key,使用新key
LinkedHashMap:
:
new
));
LinkedHashMap:
:
new
));
nicknameMap
=
objectRestResponse
.
getData
().
stream
()
nicknameMap
=
objectRestResponse
.
getData
().
stream
()
.
filter
(
a
->
a
==
null
)
.
sorted
(
Comparator
.
comparing
(
AppUserVo:
:
getUserid
).
reversed
())
.
sorted
(
Comparator
.
comparing
(
AppUserVo:
:
getUserid
).
reversed
())
.
collect
(
Collectors
.
toMap
(
AppUserVo:
:
getUserid
,
AppUserVo:
:
getNickname
,
.
collect
(
Collectors
.
toMap
(
AppUserVo:
:
getUserid
,
AppUserVo:
:
getNickname
,
(
oldValue
,
newValue
)
->
newValue
,
// 如果有相同的key,使用新key
(
oldValue
,
newValue
)
->
newValue
,
// 如果有相同的key,使用新key
...
...
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