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

Merge pull request 'fixed' (#97) from zhangwei into dev

Browse Source 
Reviewed-on: #97
This commit is contained in:
weiz 2023-10-17 19:24:24 +08:00
commit 9fb8a0e279
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/adminapi/controller/contract/VehicleContractController.php
View File

@ -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());
}
}