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
b3aa4c3b
Commit
b3aa4c3b
authored
Sep 10, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改提前还车逻辑
parent
65d4b822
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
OrderPageVO.java
.../java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
+2
-0
BackStageOrderController.java
...om/xxfc/platform/order/rest/BackStageOrderController.java
+8
-1
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
View file @
b3aa4c3b
...
...
@@ -24,6 +24,8 @@ public class OrderPageVO extends BaseOrder {
* 用户名
*/
private
String
username
;
//用户姓名
private
String
realName
;
private
String
startCompanyName
;
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @
b3aa4c3b
...
...
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import
cn.hutool.json.JSONUtil
;
import
com.github.wxiaoqi.security.admin.entity.AppUserLogin
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.admin.feign.dto.UserDTO
;
import
com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface
;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
...
...
@@ -238,7 +239,13 @@ public class BackStageOrderController extends CommonBaseController implements Us
orderPageVO
.
setCode
(
restResponse
.
getData
().
getCode
());
}
}
if
(
orderPageVO
.
getUserId
()
!=
null
)
{
AppUserDTO
appUserDTO
=
userFeign
.
userDetailById
(
orderPageVO
.
getUserId
()).
getData
();
if
(
appUserDTO
!=
null
)
{
orderPageVO
.
setUsername
(
appUserDTO
.
getUsername
());
orderPageVO
.
setRealName
(
appUserDTO
.
getRealname
());
}
}
}
return
new
ObjectRestResponse
<>().
data
(
pageDataVO
);
}
...
...
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