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
99a76563
Commit
99a76563
authored
Jun 18, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增交还车订单接口
parent
add0c68c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
BaseOrderController.java
...ava/com/xxfc/platform/order/rest/BaseOrderController.java
+5
-4
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @
99a76563
...
...
@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
import
com.github.wxiaoqi.security.admin.entity.AppUserDetail
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.dto.UserDTO
;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.common.context.BaseContextHandler
;
...
...
@@ -106,12 +107,12 @@ public class BaseOrderController extends CommonBaseController {
PageDataVO
pageDataVO
=
PageDataVO
.
pageInfo
(
query
,
()
->
baseOrderBiz
.
listOrder
(
query
.
getSuper
()));
List
<
OrderPageVO
>
list
=
pageDataVO
.
getData
();
List
<
Integer
>
userIds
=
list
.
stream
().
map
(
OrderPageVO:
:
getUserId
).
distinct
().
collect
(
Collectors
.
toList
());
ObjectRestResponse
<
List
<
AppUser
Detail
>>
objectRestResponse
=
userFeign
.
getByUserIds
(
userIds
);
ObjectRestResponse
<
List
<
AppUser
Vo
>>
objectRestResponse
=
userFeign
.
getByUserIds
(
userIds
);
for
(
OrderPageVO
orderPageVO
:
list
)
{
if
(
objectRestResponse
.
getData
()
!=
null
&&
objectRestResponse
.
getData
().
size
()
>
0
)
{
for
(
AppUser
Detail
appUserDetail
:
objectRestResponse
.
getData
())
{
if
(
appUser
Detail
!=
null
&&
appUserDetail
.
getUserid
()
==
orderPageVO
.
getUserId
())
{
orderPageVO
.
setUsername
(
appUser
Detail
.
getNickname
());
for
(
AppUser
Vo
appUserVo
:
objectRestResponse
.
getData
())
{
if
(
appUser
Vo
!=
null
&&
appUserVo
.
getUserid
()
==
orderPageVO
.
getUserId
())
{
orderPageVO
.
setUsername
(
appUser
Vo
.
getNickname
());
}
}
}
...
...
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