mkm/logistics
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
weiz 2023-10-19 09:33:31 +08:00
parent 5e201b9ead
commit 213f82cca5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/logic/vehicle/VehicleLogic.php
View File

@ -94,9 +94,7 @@ class VehicleLogic extends BaseLogic
$gpsCarHistory = (new GpsLogic()) -> history([ $gpsCarHistory = (new GpsLogic()) -> history([
'gps_car_id' => $gpsCarInfo['data']['carId'], 'gps_car_id' => $gpsCarInfo['data']['carId'],
'start_time' => date('Y-m-d').' 00:00:00', 'start_time' => date('Y-m-d').' 00:00:00',
// 'start_time' =>'2023-08-30 00:00:00',
'end_time' => date('Y-m-d').' 23:59:59' 'end_time' => date('Y-m-d').' 23:59:59'
// 'end_time' => '2023-08-30 23:59:59'
]); ]);
$gpsCarHistoryData = []; $gpsCarHistoryData = [];
if($gpsCarHistory&&$gpsCarHistory['code']==1){ if($gpsCarHistory&&$gpsCarHistory['code']==1){
@ -120,7 +118,7 @@ class VehicleLogic extends BaseLogic
$travel = (new GpsLogic()) -> mileage($gpsCarInfo['data']['carId'],date('Y-m-d H:i:s',(time() - 604800)),date('Y-m-d').' 23:59:59'); $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'] : []; $data['travel_info'] = $travel&&$travel['code'] == 1 ? $travel['data'] : [];
} }
if($data['status'] == 2){ if($data['status'] == 2 || $data['status'] == 4){
//获取租赁信息 //获取租赁信息
$rentInfo = VehicleRent::where('car_id',$data['id'])->findOrEmpty()->toArray(); $rentInfo = VehicleRent::where('car_id',$data['id'])->findOrEmpty()->toArray();
$contract = Contract::where('id',$rentInfo['contract_id'])->findOrEmpty(); $contract = Contract::where('id',$rentInfo['contract_id'])->findOrEmpty();