diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php index a7441c1a0..2381f3482 100644 --- a/app/adminapi/controller/contract/VehicleContractController.php +++ b/app/adminapi/controller/contract/VehicleContractController.php @@ -6,6 +6,7 @@ use app\adminapi\controller\BaseAdminController; use app\api\controller\JunziqianController; use app\common\enum\notice\NoticeEnum; use app\common\model\contract\VehicleContract; +use app\common\model\vehicle\VehicleRent; class VehicleContractController extends BaseAdminController { @@ -265,9 +266,16 @@ class VehicleContractController extends BaseAdminController //获取平台车辆 $carList = curl_get(env('project.logistic_domain').'/api/getAvailableVehicles'); $data['car_list'] = $carList&&$carList['code']==1 ? $carList['data'] : []; - }else{ - $data['cars_info'] = json_decode($data['cars_info'],true); } + $data['cars_info'] = json_decode($data['cars_info'],true); + $cars = $data['cars_info']; + foreach ($cars as $k=>$v) { + $rent_info = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); + if(!$rent_info->isEmpty()){ + $cars[$k]['type'] = $rent_info['type']; + } + } + $data['cars_info'] = $cars; return $this->success('success',$data->toArray()); } } \ No newline at end of file