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
532bcc51
Commit
532bcc51
authored
Dec 11, 2019
by
周健威
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-delay-add' into dev
parents
2b0f6481
7392b0bf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
OrderDelayBiz.java
...java/com/xxfc/platform/order/biz/inner/OrderDelayBiz.java
+1
-0
VehicleController.java
...ava/com/xxfc/platform/vehicle/rest/VehicleController.java
+1
-1
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderDelayBiz.java
View file @
532bcc51
...
...
@@ -164,6 +164,7 @@ public class OrderDelayBiz {
setBookStartDateTime
(
dto
.
getBookStartDateTime
());
setBookEndDateTime
(
dto
.
getBookEndDateTime
());
setBookType
(
BOOK_TYPE_RENT
);
set
}});
if
(
!
SYS_JSON_TRUE
.
equals
(
restResponse
.
getStatus
()))
{
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
View file @
532bcc51
...
...
@@ -224,7 +224,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
Integer
operatorId
=
Integer
.
parseInt
(
BaseContextHandler
.
getUserID
());
String
userName
=
BaseContextHandler
.
getName
();
bookVehicleVo
.
setStatus
(
VehicleBookRecordStatus
.
APPROVE
.
getCode
());
bookVehicleVo
.
setNotCheckTimeLegal
(
Boolean
.
FALS
E
);
bookVehicleVo
.
setNotCheckTimeLegal
(
Boolean
.
TRU
E
);
baseBiz
.
applyVehicle
(
operatorId
,
bookVehicleVo
,
userName
);
return
RestResponse
.
suc
();
}
...
...
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