修改提前还车逻辑

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

@@ -159,7 +159,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     @Transactional(rollbackFor = Exception.class)
     public ObjectRestResponse<OrderVehicleCrosstownDto> add(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
-        log.info("添加的参数：orderVehicaleCrosstown = {}", orderVehicleCrosstownDto);
+        log.info("交还车参数：orderVehicaleCrosstown = {}", orderVehicleCrosstownDto);
         UserDTO userDTO = userInfoBiz.getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, "token is null or invalid");
@@ -309,9 +309,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) { //还车
             //提前还车,结束时间大于当前时间
-            DateTime nowTime = DateTime.parse(DateTime.now().toString(), DEFAULT_DATE_TIME_FORMATTER);
-            DateTime endTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getEndTime()).toString(), DEFAULT_DATE_TIME_FORMATTER);
-            DateTime startTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getStartTime()).toString(), DEFAULT_DATE_TIME_FORMATTER);
+            DateTime nowTime = DateTime.parse(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
+            DateTime endTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getEndTime()).toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
+            DateTime startTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getStartTime()).toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
             //实际预定的天数
             int actualDay = getDaysBetweenDateTime(startTime, endTime);
             if (orderRentVehicleDetail.getEndTime() > nowTime.getMillis()) {