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

update

Browse Source
This commit is contained in:
unknown 2023-09-05 11:12:32 +08:00
parent 1487f5d65d
commit 148cb72cf8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,9 +30,9 @@ class VehicleController extends BaseApiController
$selfCar = VehicleRent::field('id')->where('company_id',$this->userInfo['company_id'])->where('status','<>',3)->where('type',1)->count(); $selfCar = VehicleRent::field('id')->where('company_id',$this->userInfo['company_id'])->where('status','<>',3)->where('type',1)->count();
//可在租车辆 //可在租车辆
$doubleRentCar = $villageCompany - $rentCar - $applyCar - $selfCar; $doubleRentCar = $villageCompany - $rentCar - $applyCar - $selfCar;
// if($params['num'] > $doubleRentCar ){ if($params['num'] > $doubleRentCar ){
// return $this->fail('数量超过可再租车辆数'); return $this->fail('数量超过可再租车辆数');
// } }
//查找乙方公司信息 //查找乙方公司信息
$party_b = Company::field('id,company_name,organization_code,master_name,master_phone,master_email,company_type')->where('id',$this->userInfo['company_id'])->find(); $party_b = Company::field('id,company_name,organization_code,master_name,master_phone,master_email,company_type')->where('id',$this->userInfo['company_id'])->find();
if(empty($party_b)) { if(empty($party_b)) {
@ -421,7 +421,7 @@ class VehicleController extends BaseApiController
$data['contract'] = VehicleContract::field('id,contract_no,file,status,create_time,update_time')->where('id',$data['contract_id'])->findOrEmpty(); $data['contract'] = VehicleContract::field('id,contract_no,file,status,create_time,update_time')->where('id',$data['contract_id'])->findOrEmpty();
} }
//当前坐标位置 //当前坐标位置
$position = curl_post(env('project.logistic_domain').'/api/getCarLocal',[],['car_id'=>$carId]); $position = curl_get(env('project.logistic_domain').'/api/getCarLocal?car_id='.$carId);
if($position && $position['code'] == 1){ if($position && $position['code'] == 1){
$data['position'] = $position['data']; $data['position'] = $position['data'];
}else{ }else{