diff --git a/app/adminapi/logic/vehicle/VehicleLogic.php b/app/adminapi/logic/vehicle/VehicleLogic.php index 931644c4..8e5b3dd8 100644 --- a/app/adminapi/logic/vehicle/VehicleLogic.php +++ b/app/adminapi/logic/vehicle/VehicleLogic.php @@ -86,6 +86,7 @@ class VehicleLogic extends BaseLogic $gpsCarInfo = (new GpsLogic()) -> info($data['gps_imei']); if($gpsCarInfo['code'] == 0){ $data['track_info'] = []; + $data['travel_info'] = []; }else{ //获取车辆行驶历史信息 $gpsCarHistory = (new GpsLogic()) -> history([ @@ -103,10 +104,10 @@ class VehicleLogic extends BaseLogic } $data['track_info'] = $position; } + //获取车辆使用情况 + $travel = (new GpsLogic()) -> mileage($gpsCarInfo['data']['carId'],date('Y-m-d H:i:s',(time() - 604800)),date('Y-m-d').' 23:59:59'); + $data['travel_info'] = $travel&&$travel['code'] == 1 ? $travel['data'] : []; } - //获取车辆使用情况 - $travel = (new GpsLogic()) -> mileage($gpsCarInfo['data']['carId'],date('Y-m-d H:i:s',(time() - 604800)),date('Y-m-d').' 23:59:59'); - $data['travel_info'] = $travel['data']; if($data['status'] == 2){ //获取租赁信息 $rentInfo = VehicleRent::where('car_id',$data['id'])->find();