diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php index 6958551ef..23160b405 100644 --- a/app/adminapi/controller/contract/VehicleContractController.php +++ b/app/adminapi/controller/contract/VehicleContractController.php @@ -277,12 +277,16 @@ class VehicleContractController extends BaseAdminController $cars[$k]['type'] = 0; } if($data['type'] == 1){ - $rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); - if($rentInfo->isEmpty()){ - $cars[$k]['type'] = 0; - }else{ - $cars[$k]['type'] = $rentInfo['type']; - } + if(empty($v['id'])){ + $cars[$k]['type'] = 1; + }else{ + $rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); + if($rentInfo->isEmpty()){ + $cars[$k]['type'] = 0; + }else{ + $cars[$k]['type'] = $rentInfo['type']; + } + } } if($data['type'] == 2){ $rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index 3766daa42..de0e4ca90 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -385,7 +385,7 @@ class VehicleController extends BaseApiController foreach ($vehicleContract_pre as $v) { $vehicleBuy = VehicleBuyRecord::where('contract_id',$v['id'])->findOrEmpty(); if($vehicleBuy->isEmpty()){ - $vehicleContract = $v; + $vehicleContract[] = $v; } } //获取车辆列表 @@ -778,6 +778,11 @@ class VehicleController extends BaseApiController 'update_time' => time(), ]); //生成关联记录 + if($xzRentCars['type'] == 0){ + $status = 2; + }else{ + $status = 1; + } VehicleBuyRecord::create([ 'company_id' => $xzCompany['id'], 'company_name' => $xzCompany['company_name'], @@ -787,7 +792,7 @@ class VehicleController extends BaseApiController 'company_email' => $xzCompany['master_email'], 'cars_info' => json_encode($cars), 'num' => count($cars), - 'status' => 2, + 'status' => $status, 'contract_id' => $res->id, 'create_time' => time() ]);