Merge branch 'master-bacground-im' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -313,6 +313,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             try {
                 RestResponse restResponse = vehicleFeign.arrivalBySmall(vehicleArrivalVo);
                 log.info("返回信息： " + restResponse.toString());
+                return ObjectRestResponse.createFailedResult(restResponse.getStatus(), restResponse.getMessage());
             } catch (Exception e) {
                 return ObjectRestResponse.createFailedResult(500, e.getMessage());
             }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -702,8 +702,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public Boolean bookedVehicle(BookVehicleVO bookVehicleVo) throws Exception {
         //提取日期和相应的预定目标日期
         Map<String, List<String>> yearMonthAndDate = Maps.newHashMap();
-        DateTime startDay = DateTime.parse(bookVehicleVo.getBookStartDate(), DATE_TIME_FORMATTER);
-        DateTime endDay = DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
+        DateTime startDay = DateTime.parse(bookVehicleVo.getBookStartDate(), DEFAULT_DATE_TIME_FORMATTER);
+        DateTime endDay = DateTime.parse(bookVehicleVo.getBookEndDate(), DEFAULT_DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate, startDay, endDay);
         if (yearMonthAndDate.size() > 3) {//连续的日期最多夸3个月