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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev

Browse Source
This commit is contained in:
yaooo 2023-10-11 18:22:14 +08:00
commit ad8d0f78c8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -492,7 +492,6 @@ class IndexController extends BaseApiController
//判断是否有监管车辆
$jgCars = VehicleRent::where('rent_company_id',$contract['company_b_id'])->where('status',2)->where('type',2)->findOrEmpty();
if($jgCars->isEmpty()){
//获取小组服务公司的镇街公司
//获取镇街公司信息
$zjCompany = Contract::field('party_a')->where('party_b',$contract['company_b_id'])->where('signing_timer',2)->findOrEmpty();
//将车辆加入到本地租赁列表
@ -510,15 +509,20 @@ class IndexController extends BaseApiController
'create_time' => time()
];
$vehicleRent = new VehicleRent();
$vehicleRent->saveAll($data);
$vehicleRent->save($data);
}
//获取签约公司信息
$compay = Company::where('id',$contract['company_b_id'])->findOrEmpty();
//更新远程
$updateSverRes = curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[
'id' => $contract['contract_logistic_id'],
'signing_timer' => 2,
'status' => 3,
'contract_url'=>$signContractFile,
'contract_evidence'=>$contractEvidence
'contract_evidence'=>$contractEvidence,
'use_user_id' =>$compay['user_id'],
'use_user_name' =>$compay['master_name'],
'use_user_phone' =>$compay['master_phone'],
]);
if(!$updateLocalRes || $updateSverRes['code']==0){
return json(['success' => false, 'msg' => '更新失败']);