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
94b66e8c
Commit
94b66e8c
authored
Oct 14, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单出车时间限制
parent
758ed268
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
10 deletions
+2
-10
OrderVehicleCrosstownBiz.java
...com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
+2
-3
BackStageOrderController.java
...om/xxfc/platform/order/rest/BackStageOrderController.java
+0
-7
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
View file @
94b66e8c
...
@@ -227,7 +227,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
...
@@ -227,7 +227,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
RestResponse
restResponse
=
vehicleFeign
.
departureBySmall
(
vehicleDepartureVo
);
RestResponse
restResponse
=
vehicleFeign
.
departureBySmall
(
vehicleDepartureVo
);
log
.
info
(
"返回信息: "
+
restResponse
);
log
.
info
(
"返回信息: "
+
restResponse
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
ObjectRestResponse
.
createFailedResult
(
1001
,
e
.
getMessage
());
return
ObjectRestResponse
.
createFailedResult
(
1001
,
e
.
getMessage
());
}
}
}
else
if
(
orderVehicleCrosstownDto
.
getType
()
==
CrosstownTypeEnum
.
ARRIVE
.
getCode
()
||
orderVehicleCrosstownDto
.
getType
()
==
CrosstownTypeEnum
.
FIXED_LOSS
.
getCode
())
{
//还车
}
else
if
(
orderVehicleCrosstownDto
.
getType
()
==
CrosstownTypeEnum
.
ARRIVE
.
getCode
()
||
orderVehicleCrosstownDto
.
getType
()
==
CrosstownTypeEnum
.
FIXED_LOSS
.
getCode
())
{
//还车
...
@@ -243,9 +242,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
...
@@ -243,9 +242,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
vehicleArrivalVo
.
setRecycleManTel
(
"13565235623"
);
vehicleArrivalVo
.
setRecycleManTel
(
"13565235623"
);
}
}
try
{
try
{
vehicleFeign
.
arrivalBySmall
(
vehicleArrivalVo
);
RestResponse
restResponse
=
vehicleFeign
.
arrivalBySmall
(
vehicleArrivalVo
);
log
.
info
(
"返回信息: "
+
restResponse
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
ObjectRestResponse
.
createFailedResult
(
500
,
e
.
getMessage
());
return
ObjectRestResponse
.
createFailedResult
(
500
,
e
.
getMessage
());
}
}
}
}
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @
94b66e8c
...
@@ -359,13 +359,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
...
@@ -359,13 +359,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
return
ObjectRestResponse
.
succ
();
return
ObjectRestResponse
.
succ
();
}
}
@PostMapping
(
"/updateEndCompany"
)
@ResponseBody
public
ObjectRestResponse
updateEndCompany
(
@RequestBody
OrderRentVehicleDetail
orderRentVehicleDetail
)
{
return
baseOrderBiz
.
save
(
orderRentVehicleDetail
);
}
@Data
@Data
public
static
class
ChangeVehicleDTO
{
public
static
class
ChangeVehicleDTO
{
String
no
;
String
no
;
...
...
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