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
1408dd55
Commit
1408dd55
authored
Jun 29, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改交还车接口
parent
d700f80d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
OrderVehicleCrosstownController.java
.../platform/order/rest/OrderVehicleCrosstownController.java
+10
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderVehicleCrosstownController.java
View file @
1408dd55
...
@@ -55,6 +55,9 @@ public class OrderVehicleCrosstownController {
...
@@ -55,6 +55,9 @@ public class OrderVehicleCrosstownController {
if
(
baseOrder
.
getStatus
()
==
4
)
{
if
(
baseOrder
.
getStatus
()
==
4
)
{
baseOrder
.
setStatus
(
5
);
baseOrder
.
setStatus
(
5
);
baseOrderBiz
.
updateSelectiveById
(
baseOrder
);
baseOrderBiz
.
updateSelectiveById
(
baseOrder
);
}
else
if
(
baseOrder
.
getStatus
()
==
5
)
{
baseOrder
.
setStatus
(
6
);
baseOrderBiz
.
updateSelectiveById
(
baseOrder
);
}
}
OrderVehicleCrosstownDto
vehicleCrosstownDto
=
new
OrderVehicleCrosstownDto
();
OrderVehicleCrosstownDto
vehicleCrosstownDto
=
new
OrderVehicleCrosstownDto
();
BeanUtil
.
copyProperties
(
oldValue
.
get
(
0
),
vehicleCrosstownDto
,
CopyOptions
.
create
().
setIgnoreNullValue
(
true
).
setIgnoreError
(
true
));
BeanUtil
.
copyProperties
(
oldValue
.
get
(
0
),
vehicleCrosstownDto
,
CopyOptions
.
create
().
setIgnoreNullValue
(
true
).
setIgnoreError
(
true
));
...
@@ -70,8 +73,13 @@ public class OrderVehicleCrosstownController {
...
@@ -70,8 +73,13 @@ public class OrderVehicleCrosstownController {
getOrderLicense
(
orderVehicleCrosstownDto
);
getOrderLicense
(
orderVehicleCrosstownDto
);
orderVehicalCrosstownBiz
.
insertSelective
(
orderVehicleCrosstownDto
);
orderVehicalCrosstownBiz
.
insertSelective
(
orderVehicleCrosstownDto
);
//交车完成 设置订单状态为出行中
//交车完成 设置订单状态为出行中
baseOrder
.
setStatus
(
5
);
if
(
baseOrder
.
getStatus
()
==
4
)
{
baseOrderBiz
.
updateSelectiveById
(
baseOrder
);
baseOrder
.
setStatus
(
5
);
baseOrderBiz
.
updateSelectiveById
(
baseOrder
);
}
else
if
(
baseOrder
.
getStatus
()
==
5
)
{
baseOrder
.
setStatus
(
6
);
baseOrderBiz
.
updateSelectiveById
(
baseOrder
);
}
return
ObjectRestResponse
.
succ
(
orderVehicleCrosstownDto
);
return
ObjectRestResponse
.
succ
(
orderVehicleCrosstownDto
);
}
}
return
ObjectRestResponse
.
createDefaultFail
();
return
ObjectRestResponse
.
createDefaultFail
();
...
...
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