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
3ade5a6b
Commit
3ade5a6b
authored
Dec 11, 2019
by
周健威
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-delay-add' into dev
parents
f1323606
73681825
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
OrderDelayBiz.java
...java/com/xxfc/platform/order/biz/inner/OrderDelayBiz.java
+3
-3
BookVehicleVO.java
...in/java/com/xxfc/platform/vehicle/pojo/BookVehicleVO.java
+2
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderDelayBiz.java
View file @
3ade5a6b
...
@@ -172,13 +172,13 @@ public class OrderDelayBiz {
...
@@ -172,13 +172,13 @@ public class OrderDelayBiz {
//根据订单号获取订单
//根据订单号获取订单
RestResponse
restResponse
=
vehicleFeign
.
updateOrderBookRecord
(
new
BookVehicleVO
()
{{
RestResponse
restResponse
=
vehicleFeign
.
updateOrderBookRecord
(
new
BookVehicleVO
()
{{
setVehicleId
(
orderPageVO
.
getOrderRentVehicleDetail
().
getVehicleId
());
setVehicleId
(
orderPageVO
.
getOrderRentVehicleDetail
().
getVehicleId
());
setBookStartDate
(
dto
.
getBookStartDate
());
setBookStartDate
(
dto
.
getBookStartDate
Time
());
setBookEndDate
(
dto
.
getBookEndDate
());
setBookEndDate
(
dto
.
getBookEndDate
Time
());
setBookStartDateTime
(
dto
.
getBookStartDateTime
());
setBookStartDateTime
(
dto
.
getBookStartDateTime
());
setBookEndDateTime
(
dto
.
getBookEndDateTime
());
setBookEndDateTime
(
dto
.
getBookEndDateTime
());
}});
}});
if
(
!
SYS_
TRUE
.
equals
(
restResponse
.
getCode
()))
{
if
(
!
SYS_
JSON_TRUE
.
equals
(
restResponse
.
getStatus
()))
{
throw
new
BaseException
(
ResultCode
.
FAILED_CODE
,
Sets
.
newSet
(
"延期失败"
));
throw
new
BaseException
(
ResultCode
.
FAILED_CODE
,
Sets
.
newSet
(
"延期失败"
));
}
}
cloudTransact
=
1
;
cloudTransact
=
1
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BookVehicleVO.java
View file @
3ade5a6b
...
@@ -18,13 +18,13 @@ public class BookVehicleVO {
...
@@ -18,13 +18,13 @@ public class BookVehicleVO {
/**
/**
* 预定目标日期(开始)
* 预定目标日期(开始)
*/
*/
@ApiModelProperty
(
"预定目标日期(开始)"
)
@ApiModelProperty
(
"预定目标日期(开始)
yyyy-MM-dd HH:mm:ss
"
)
private
String
bookStartDate
;
private
String
bookStartDate
;
/**
/**
* 预定目标日期(结束)
* 预定目标日期(结束)
*/
*/
@ApiModelProperty
(
"预定目标日期(结束)"
)
@ApiModelProperty
(
"预定目标日期(结束)
yyyy-MM-dd HH:mm:ss
"
)
private
String
bookEndDate
;
private
String
bookEndDate
;
/**
/**
...
...
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