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

Merge pull request '上传自有车辆图片' (#18) from zhangwei into dev

Browse Source 
Reviewed-on: #18
This commit is contained in:
weiz 2023-09-07 13:40:51 +08:00
commit f112d64468
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/api/controller/IndexController.php
View File

@ -250,6 +250,7 @@ class IndexController extends BaseApiController
$vehicle = json_decode($contract['cars_info'], true); $vehicle = json_decode($contract['cars_info'], true);
$curl_res = curl_post(env('project.logistic_domain').'/api/addSelfCar', [], [ $curl_res = curl_post(env('project.logistic_domain').'/api/addSelfCar', [], [
'license' => $vehicle['license'], 'license' => $vehicle['license'],
'pic' => $vehicle['pic'],
'company_id' => $contract['company_a_id'], 'company_id' => $contract['company_a_id'],
'company_name' => $contract['company_a_name'], 'company_name' => $contract['company_a_name'],
'company_user' => $contract['company_a_user'], 'company_user' => $contract['company_a_user'],

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

@ -204,7 +204,12 @@ class VehicleController extends BaseApiController
return $this->fail('请求类型错误'); return $this->fail('请求类型错误');
} }
//获取参数 //获取参数
$license = $this->request->post('license'); $params = $this->request->post(['type','license','pic']);
if($params['type'] == 1){
if(empty($params['license']) || empty($params['pic'])){
return $this->fail('缺少必要参数');
}
}
//获取当前公司信息 //获取当前公司信息
$party_b = Company::field('id,company_name,master_name,master_phone,master_email,is_contract,organization_code,company_type')->where('id',$this->userInfo['company_id'])->find(); $party_b = Company::field('id,company_name,master_name,master_phone,master_email,is_contract,organization_code,company_type')->where('id',$this->userInfo['company_id'])->find();
if(empty($party_b)){ if(empty($party_b)){
@ -233,6 +238,13 @@ class VehicleController extends BaseApiController
if(!empty($vehicleContract)){ if(!empty($vehicleContract)){
return $this->fail('请勿重复申请'); return $this->fail('请勿重复申请');
} }
if($params['type'] == 1){
$cars_info = json_encode(['license'=>$params['license'],'pic'=>$params['pic']]);
$car_type = 1;
}else{
$cars_info = null;
$car_type = 0;
}
//设置数据 //设置数据
$data = [ $data = [
'contract_logistic_id' => 0, 'contract_logistic_id' => 0,
@ -249,9 +261,9 @@ class VehicleController extends BaseApiController
'company_b_user' => $party_b['master_name'], 'company_b_user' => $party_b['master_name'],
'company_b_phone' => $party_b['master_phone'], 'company_b_phone' => $party_b['master_phone'],
'company_b_email' => $party_b['master_email'], 'company_b_email' => $party_b['master_email'],
'cars_info' => isset($license) ? json_encode(['license'=>$license]) : null, 'cars_info' => $cars_info,
'num' => 1, 'num' => 1,
'type' => isset($license) ? 1 : 0, 'type' => $car_type,
'status' => -1, 'status' => -1,
'create_time' => time(), 'create_time' => time(),
'update_time' => time() 'update_time' => time()