interface

@@ -157,7 +157,7 @@ class OrderController extends HomeBaseController{
                     $price +=(ceil(($endTime-$new_start_time)/3600) * $interval['price'] +  ceil(($new_end_time-$stateTime)/3600) * $interval['price'] + ceil(($stateTime-$endTime)/3600) * $cost['cost']);
                     $price +=(ceil(($endTime-$new_start_time)/3600) * $interval['price'] +  ceil(($new_end_time-$stateTime)/3600) * $interval['price'] + ceil(($stateTime-$endTime)/3600) * $cost['cost']);
                 }
                 }
                 //不与预设时间段重合
                 //不与预设时间段重合
-                if (($new_start_time > $endTime && $new_start_time < $stateTime) && ($new_end_time < $new_start_time && $new_end_time < $stateTime)){
+                if (($new_start_time > $endTime && $new_start_time < $stateTime) && ($new_end_time > $new_start_time && $new_end_time < $stateTime)){
                     //存在首小时免费
                     //存在首小时免费
                     dump('4');
                     dump('4');
                     $price +=(ceil(($new_end_time-$new_start_time)/3600) * $cost['cost']);
                     $price +=(ceil(($new_end_time-$new_start_time)/3600) * $cost['cost']);