Commit ec7afcfc authored by hezhen's avatar hezhen

123

parent 206c604c
...@@ -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);
......
...@@ -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));
} }
......
...@@ -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.checkHasSpecialRentFeginV2(vehicle.getId());
if (restResponse.getData() == null ){ if (restResponse.getData() == null ){
return restResponse; return restResponse;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment