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

Merge pull request 'update' (#81) from zhangwei into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/81
This commit is contained in:
wei1990 2023-08-31 19:05:42 +08:00
commit a53e8b6ddf
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/api/controller/VehicleController.php
View File

@ -334,25 +334,27 @@ class VehicleController extends BaseApiController
if(empty($vehicleContract)){ if(empty($vehicleContract)){
return $this->success('没有数据，请申请'); return $this->success('没有数据，请申请');
} }
if(!empty($vehicleContract['cars_info'])){ if($vehicleContract['status'] == 3){
$vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true);
if(!empty($vehicleContract['cars_info'])){ if(!empty($vehicleContract['cars_info'])){
$arr = $vehicleContract['cars_info']; $vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true);
$arr['mileage'] = 0; if(!empty($vehicleContract['cars_info'])){
$position = curl_get($this->url.'/api/getCarLocal?car_id='.$arr['id']); $arr = $vehicleContract['cars_info'];
if($position && $position['code'] == 1){ $arr['mileage'] = 0;
$arr['lon'] = $position['data']['lon']; $position = curl_get($this->url.'/api/getCarLocal?car_id='.$arr['id']);
$arr['lat'] = $position['data']['lat']; if($position && $position['code'] == 1){
$arr['lon'] = $position['data']['lon'];
$arr['lat'] = $position['data']['lat'];
}
$vehicleContract['cars_info'] = $arr;
} }
$vehicleContract['cars_info'] = $arr;
} }
$vehicleContract['province'] = $company['province_name'];
$vehicleContract['city'] = $company['city_name'];
$vehicleContract['area'] = $company['area_name'];
$vehicleContract['street'] = $company['street_name'];
$vehicleContract['village'] = $company['village_name'];
$vehicleContract['brigade'] = $company['brigade_name'];
} }
$vehicleContract['province'] = $company['province_name'];
$vehicleContract['city'] = $company['city_name'];
$vehicleContract['area'] = $company['area_name'];
$vehicleContract['street'] = $company['street_name'];
$vehicleContract['village'] = $company['village_name'];
$vehicleContract['brigade'] = $company['brigade_name'];
//返回数据 //返回数据
return $this->success('请求成功',$vehicleContract->toArray()); return $this->success('请求成功',$vehicleContract->toArray());
} }