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
817ec05d
Commit
817ec05d
authored
Nov 11, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-modify-background-bug-hf' into base-modify
parents
93f08ca6
48f5ae9e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
BackStageOrderController.java
...om/xxfc/platform/order/rest/BackStageOrderController.java
+5
-0
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @
817ec05d
...
...
@@ -220,15 +220,20 @@ public class BackStageOrderController extends CommonBaseController implements Us
}
if
(
orderPageVO
.
getOrderRentVehicleDetail
()
!=
null
&&
orderPageVO
.
getOrderRentVehicleDetail
().
getVehicleId
()
!=
null
)
{
String
vehicleId
=
orderPageVO
.
getOrderRentVehicleDetail
().
getVehicleId
();
log
.
info
(
"该订单车辆id:{}"
,
vehicleId
);
RestResponse
<
Vehicle
>
restResponse
=
vehicleFeign
.
findById
(
orderPageVO
.
getOrderRentVehicleDetail
().
getVehicleId
());
log
.
info
(
"获取车辆信息返回消息:{}"
,
restResponse
.
getData
());
if
(
restResponse
.
getData
()
!=
null
)
{
orderPageVO
.
setVehicleNumberPlat
(
restResponse
.
getData
().
getNumberPlate
());
orderPageVO
.
setVehicleCode
(
restResponse
.
getData
().
getCode
());
}
if
(
StringUtils
.
isNotBlank
(
orderPageVO
.
getOrderRentVehicleDetail
().
getMyDriverIds
()))
{
log
.
info
(
"本人驾驶,驾驶人id:{}"
,
orderPageVO
.
getOrderRentVehicleDetail
().
getMyDriverIds
());
try
{
List
<
VehicleUserLicense
>
orderUserLicenses
=
vehicleFeign
.
getVehicleLicenseList
(
orderPageVO
.
getOrderRentVehicleDetail
().
getMyDriverIds
()).
getData
();
log
.
info
(
"驾驶人信息:{}"
,
orderUserLicenses
);
if
(
orderUserLicenses
!=
null
&&
orderUserLicenses
.
size
()
>
0
)
{
OrderVehicleCrosstownDto
orderVehicleCrosstownDto
=
new
OrderVehicleCrosstownDto
();
orderVehicleCrosstownDto
.
setLicenseIdCard
(
orderUserLicenses
.
get
(
0
).
getIdCard
());
...
...
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