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
e117a747
Commit
e117a747
authored
Oct 30, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改预约时间相关
parent
86d918f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
OrderRentVehicleService.java
.../xxfc/platform/order/service/OrderRentVehicleService.java
+2
-0
RentVehicleController.java
...com/xxfc/platform/vehicle/rest/RentVehicleController.java
+2
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java
View file @
e117a747
...
@@ -462,6 +462,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
...
@@ -462,6 +462,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
rentVehicleBookDTO
.
setNumberPlate
(
numberPlate
);
rentVehicleBookDTO
.
setNumberPlate
(
numberPlate
);
rentVehicleBookDTO
.
setStatus
(
status
);
rentVehicleBookDTO
.
setStatus
(
status
);
rentVehicleBookDTO
.
setUseType
(
detail
.
getUseType
());
rentVehicleBookDTO
.
setUseType
(
detail
.
getUseType
());
rentVehicleBookDTO
.
setBookStartDate
(
detail
.
getBookVehicleVO
().
getBookStartDateTime
());
rentVehicleBookDTO
.
setBookEndDate
(
detail
.
getBookVehicleVO
().
getBookEndDateTime
());
if
(
null
!=
detail
.
getAccompanyItems
())
{
if
(
null
!=
detail
.
getAccompanyItems
())
{
rentVehicleBookDTO
.
setSelectedAccItem
(
detail
.
getAccompanyItems
().
parallelStream
().
collect
(
Collectors
.
toMap
(
OrderAccompanyDTO:
:
getId
,
OrderAccompanyDTO:
:
getNum
)));
rentVehicleBookDTO
.
setSelectedAccItem
(
detail
.
getAccompanyItems
().
parallelStream
().
collect
(
Collectors
.
toMap
(
OrderAccompanyDTO:
:
getId
,
OrderAccompanyDTO:
:
getNum
)));
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java
View file @
e117a747
...
@@ -200,9 +200,9 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
...
@@ -200,9 +200,9 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
LocalDateTime
ldt
=
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
System
.
currentTimeMillis
()),
ZoneOffset
.
ofHours
(
8
)).
plusSeconds
(
30L
);
LocalDateTime
ldt
=
LocalDateTime
.
ofInstant
(
Instant
.
ofEpochMilli
(
System
.
currentTimeMillis
()),
ZoneOffset
.
ofHours
(
8
)).
plusSeconds
(
30L
);
dto
.
setBookStartDate
(
DateTimeFormatter
.
ofPattern
(
DATE_TIME_LINE
).
format
(
ldt
));
dto
.
setBookStartDate
(
DateTimeFormatter
.
ofPattern
(
DATE_TIME_LINE
).
format
(
ldt
));
}
else
{
}
else
{
dto
.
setBookStartDate
(
dto
.
getBook
StartDate
()+
" 00:00:00"
);
dto
.
setBookStartDate
(
dto
.
getBook
EndDate
()
);
}
}
dto
.
setBookEndDate
(
dto
.
getBookEndDate
()
+
" 23:59:59"
);
dto
.
setBookEndDate
(
dto
.
getBookEndDate
());
BookVehicleVO
bookVehicleVo
=
BeanUtil
.
toBean
(
dto
,
BookVehicleVO
.
class
);
BookVehicleVO
bookVehicleVo
=
BeanUtil
.
toBean
(
dto
,
BookVehicleVO
.
class
);
bookVehicleVo
.
setBookType
(
BookType
.
USER_RENT
.
getCode
());
bookVehicleVo
.
setBookType
(
BookType
.
USER_RENT
.
getCode
());
bookVehicleVo
.
setVehicleId
(
bookVehicleId
);
bookVehicleVo
.
setVehicleId
(
bookVehicleId
);
...
...
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