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
ec7afcfc
Commit
ec7afcfc
authored
Nov 05, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
206c604c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
OrderFeign.java
...c/main/java/com/xxfc/platform/order/feign/OrderFeign.java
+5
-1
SpecialRentController.java
...a/com/xxfc/platform/order/rest/SpecialRentController.java
+10
-1
VehicleBiz.java
...c/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
+1
-1
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java
View file @
ec7afcfc
...
@@ -35,10 +35,14 @@ public interface OrderFeign {
...
@@ -35,10 +35,14 @@ public interface OrderFeign {
ObjectRestResponse
<
List
<
OrderDTO
>>
findOrdersByorderIdV2
(
@RequestBody
List
<
Integer
>
orderIds
);
ObjectRestResponse
<
List
<
OrderDTO
>>
findOrdersByorderIdV2
(
@RequestBody
List
<
Integer
>
orderIds
);
@
RequestMapping
(
value
=
"specialRent/app/unauth/checkHasSpecialRentFegin"
,
method
=
RequestMethod
.
GET
)
@
GetMapping
(
value
=
"chw/specialRent/app/unauth/checkHasSpecialRentFegin"
)
ObjectRestResponse
<
Boolean
>
checkHasSpecialRentFegin
(
String
vehicleId
);
ObjectRestResponse
<
Boolean
>
checkHasSpecialRentFegin
(
String
vehicleId
);
@PostMapping
(
value
=
"chw/specialRent/app/unauth/checkHasSpecialRentFeginV2"
)
ObjectRestResponse
<
Boolean
>
checkHasSpecialRentFeginV2
(
@RequestBody
String
vehicleId
);
@RequestMapping
(
value
=
"chw/orderDetail/app/unauth/getOrderDetail"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"chw/orderDetail/app/unauth/getOrderDetail"
,
method
=
RequestMethod
.
GET
)
ObjectRestResponse
<
OrderDetailDTO
>
getOrderDetail
(
@RequestParam
(
"orderNo"
)
String
orderNo
,
@RequestParam
(
"type"
)
Integer
type
);
ObjectRestResponse
<
OrderDetailDTO
>
getOrderDetail
(
@RequestParam
(
"orderNo"
)
String
orderNo
,
@RequestParam
(
"type"
)
Integer
type
);
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java
View file @
ec7afcfc
...
@@ -197,7 +197,16 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
...
@@ -197,7 +197,16 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
@ResponseBody
@ResponseBody
@IgnoreUserToken
@IgnoreUserToken
@ApiOperation
(
value
=
"判断车辆是否有进行中的特惠租车"
)
@ApiOperation
(
value
=
"判断车辆是否有进行中的特惠租车"
)
public
ObjectRestResponse
checkHasSpecialRent
(
String
vehicleId
)
{
public
ObjectRestResponse
checkHasSpecialRent
(
@RequestParam
(
"vehicleId"
)
String
vehicleId
)
{
return
ObjectRestResponse
.
succ
(
baseBiz
.
checkHasSpecialRent
(
vehicleId
));
}
@RequestMapping
(
value
=
"/app/unauth/checkHasSpecialRentFeginV2"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
@IgnoreUserToken
@ApiOperation
(
value
=
"判断车辆是否有进行中的特惠租车"
)
public
ObjectRestResponse
checkHasSpecialRentFeginV2
(
@RequestBody
String
vehicleId
)
{
return
ObjectRestResponse
.
succ
(
baseBiz
.
checkHasSpecialRent
(
vehicleId
));
return
ObjectRestResponse
.
succ
(
baseBiz
.
checkHasSpecialRent
(
vehicleId
));
}
}
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @
ec7afcfc
...
@@ -1799,7 +1799,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
...
@@ -1799,7 +1799,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
public
ObjectRestResponse
updState
(
Vehicle
vehicle
){
public
ObjectRestResponse
updState
(
Vehicle
vehicle
){
ObjectRestResponse
<
Boolean
>
restResponse
=
orderFeign
.
checkHasSpecialRentFegin
(
vehicle
.
getId
());
ObjectRestResponse
<
Boolean
>
restResponse
=
orderFeign
.
checkHasSpecialRentFegin
V2
(
vehicle
.
getId
());
if
(
restResponse
.
getData
()
==
null
){
if
(
restResponse
.
getData
()
==
null
){
return
restResponse
;
return
restResponse
;
}
}
...
...
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