Merge branch 'master-order' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java

@@ -70,11 +70,11 @@ public class OrderRentVehicleController extends CommonBaseController {
         @ResponseBody
         @ApiOperation(value = "确认租车订单")
         public ObjectRestResponse<BaseOrder> add(@RequestBody AddRentVehicleDTO vo){
-//            RentVehicleBO bo = initRentVehicleBO(vo);
-//            bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
-//            orderRentVehicleService.createOrder(bo);
-//            return ObjectRestResponse.succ(bo.getOrder());
-                return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "系统正在维护阶段，请联系客服！");
+            RentVehicleBO bo = initRentVehicleBO(vo);
+            bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
+            orderRentVehicleService.createOrder(bo);
+            return ObjectRestResponse.succ(bo.getOrder());
+//                return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "系统维护，请联系客服线下租车: 4000-369-369！");
         }
 
         @RequestMapping(value = "back-stage/add",method = RequestMethod.POST)