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
dbe6fe0e
Commit
dbe6fe0e
authored
Aug 03, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单修改bug
parent
14d190f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
OrderRentVehicleController.java
.../xxfc/platform/order/rest/OrderRentVehicleController.java
+1
-0
OrderRentVehicleService.java
.../xxfc/platform/order/service/OrderRentVehicleService.java
+3
-0
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java
View file @
dbe6fe0e
...
@@ -61,6 +61,7 @@ public class OrderRentVehicleController extends CommonBaseController {
...
@@ -61,6 +61,7 @@ public class OrderRentVehicleController extends CommonBaseController {
bo
.
setAppUserDTO
(
userFeign
.
userDetailByToken
(
BaseContextHandler
.
getToken
()).
getData
());
bo
.
setAppUserDTO
(
userFeign
.
userDetailByToken
(
BaseContextHandler
.
getToken
()).
getData
());
bo
.
setTickerNo
(
StrUtil
.
isNotBlank
(
vo
.
getTickerNos
())?
bo
.
setTickerNo
(
StrUtil
.
isNotBlank
(
vo
.
getTickerNos
())?
StrUtil
.
splitTrim
(
vo
.
getTickerNos
(),
","
):
null
);
StrUtil
.
splitTrim
(
vo
.
getTickerNos
(),
","
):
null
);
bo
.
setAccompanyItems
(
vo
.
getAccompanyItems
());
orderRentVehicleService
.
createOrder
(
bo
);
orderRentVehicleService
.
createOrder
(
bo
);
return
ObjectRestResponse
.
succ
(
bo
.
getOrder
());
return
ObjectRestResponse
.
succ
(
bo
.
getOrder
());
}
}
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java
View file @
dbe6fe0e
...
@@ -159,6 +159,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
...
@@ -159,6 +159,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
//插入随声物品item
//插入随声物品item
Map
<
String
,
AccompanyingItemVo
>
accompanyingItemMap
=
vehicleFeign
.
listAccompanyingItem
().
getData
()
Map
<
String
,
AccompanyingItemVo
>
accompanyingItemMap
=
vehicleFeign
.
listAccompanyingItem
().
getData
()
.
parallelStream
().
collect
(
Collectors
.
toMap
(
en
->
en
.
getId
().
toString
(),
en
->
en
));
.
parallelStream
().
collect
(
Collectors
.
toMap
(
en
->
en
.
getId
().
toString
(),
en
->
en
));
if
(
null
==
bo
.
getAccompanyItems
())
{
bo
.
setAccompanyItems
(
new
ArrayList
<
OrderAccompanyDTO
>());
}
for
(
OrderAccompanyDTO
oad
:
bo
.
getAccompanyItems
())
{
for
(
OrderAccompanyDTO
oad
:
bo
.
getAccompanyItems
())
{
AccompanyingItemVo
aiv
=
accompanyingItemMap
.
get
(
oad
.
getId
());
AccompanyingItemVo
aiv
=
accompanyingItemMap
.
get
(
oad
.
getId
());
oad
.
setName
(
aiv
.
getName
());
oad
.
setName
(
aiv
.
getName
());
...
...
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