From d3a488889bf0df66e115171d6fcc21599883b923 Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Sat, 9 Sep 2023 11:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=BE=E7=BA=A6=E8=AF=81?= =?UTF-8?q?=E6=8D=AE=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/IndexController.php | 41 ++++++++++++++++------ app/api/controller/JunziqianController.php | 8 +++-- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 5798b04be..ea7ef4adb 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -32,7 +32,7 @@ use think\response\Json; */ class IndexController extends BaseApiController { - public array $notNeedLogin = ['test','index', 'config', 'policy', 'decorate', 'notifyUrl', 'notifyProperty', 'notifyAuthentication', 'notifyVehicleContractUpdate', 'systemCarRent', 'selfCarRent', 'cancelRent']; + public array $notNeedLogin = ['index', 'config', 'policy', 'decorate', 'notifyUrl', 'notifyProperty', 'notifyAuthentication', 'notifyVehicleContractUpdate', 'systemCarRent', 'selfCarRent', 'cancelRent']; /** * @notes 首页数据 @@ -49,12 +49,6 @@ class IndexController extends BaseApiController return $this->data($result); } - public function test() { - $res = app(JunziqianController::class)->downloadVehicleContractEvidence('APL1699006920226521088','泸县供投里海农业科技有限公司','91510521MAC477XA13'); - dump($res); - } - - /** * @notes 全局配置 * @return Json @@ -196,8 +190,17 @@ class IndexController extends BaseApiController //获取签约后的合同 $signContractFile = app(JunziqianController::class)->downloadVehicleContractFile($contract['contract_no']); $signContractFile = $signContractFile ?? ''; + //获取签约后的证据 + $signContractEvidenceToPartyA = app(JunziqianController::class)->downloadVehicleContractEvidence($contract['contract_no'],$contract['company_a_name'],$contract['company_a_code']); + $signContractEvidenceToPartyA = $signContractEvidenceToPartyA ?? ''; + $signContractEvidenceToPartyB = app(JunziqianController::class)->downloadVehicleContractEvidence($contract['contract_no'],$contract['company_b_name'],$contract['company_b_code']); + $signContractEvidenceToPartyB = $signContractEvidenceToPartyB ?? ''; + $contractEvidence = json_encode([ + 'party_a' => $signContractEvidenceToPartyA, + 'party_b' => $signContractEvidenceToPartyB + ]); //更改合同状态 - VehicleContract::where('id', $id)->update(['signing_timer' => 2, 'status' => 3,'contract_url'=>$signContractFile]); + VehicleContract::where('id', $id)->update(['signing_timer' => 2, 'status' => 3,'contract_url'=>$signContractFile,'contract_evidence'=>$contractEvidence]); //添加车辆到租赁列表 $vehicle = json_decode($contract['cars_info'], true); VehicleRent::where('car_id', $vehicle['id'])->update([ @@ -270,7 +273,16 @@ class IndexController extends BaseApiController //获取签约后的合同 $signContractFile = app(JunziqianController::class)->downloadVehicleContractFile($contract['contract_no']); $signContractFile = $signContractFile ?? ''; - VehicleContract::where('id', $id)->update(['cars_info'=>$cars_info,'update_time'=>time(),'signing_timer'=>2,'status'=>3,'contract_url'=>$signContractFile]); + //获取签约后的证据 + $signContractEvidenceToPartyA = app(JunziqianController::class)->downloadVehicleContractEvidence($contract['contract_no'],$contract['company_a_name'],$contract['company_a_code']); + $signContractEvidenceToPartyA = $signContractEvidenceToPartyA ?? ''; + $signContractEvidenceToPartyB = app(JunziqianController::class)->downloadVehicleContractEvidence($contract['contract_no'],$contract['company_b_name'],$contract['company_b_code']); + $signContractEvidenceToPartyB = $signContractEvidenceToPartyB ?? ''; + $contractEvidence = json_encode([ + 'party_a' => $signContractEvidenceToPartyA, + 'party_b' => $signContractEvidenceToPartyB + ]); + VehicleContract::where('id', $id)->update(['cars_info'=>$cars_info,'update_time'=>time(),'signing_timer'=>2,'status'=>3,'contract_url'=>$signContractFile,'contract_evidence'=>$contractEvidence]); VehicleRent::create([ 'car_id' => $curl_res['data']['car_id'], 'contract_id' => $contract['id'], @@ -333,8 +345,17 @@ class IndexController extends BaseApiController //获取签约后的合同 $signContractFile = app(JunziqianController::class)->downloadVehicleContractFile($contract['contract_no']); $signContractFile = $signContractFile ?? ''; + //获取签约后的证据 + $signContractEvidenceToPartyA = app(JunziqianController::class)->downloadVehicleContractEvidence($contract['contract_no'],$contract['company_a_name'],$contract['company_a_code']); + $signContractEvidenceToPartyA = $signContractEvidenceToPartyA ?? ''; + $signContractEvidenceToPartyB = app(JunziqianController::class)->downloadVehicleContractEvidence($contract['contract_no'],$contract['company_b_name'],$contract['company_b_code']); + $signContractEvidenceToPartyB = $signContractEvidenceToPartyB ?? ''; + $contractEvidence = json_encode([ + 'party_a' => $signContractEvidenceToPartyA, + 'party_b' => $signContractEvidenceToPartyB + ]); //更改合同状态 - VehicleContract::where('id', $id)->update(['signing_timer'=>2,'status'=>3,'contract_url'=>$signContractFile]); + VehicleContract::where('id', $id)->update(['signing_timer'=>2,'status'=>3,'contract_url'=>$signContractFile,'contract_evidence'=>$contractEvidence]); //更改租赁列表车辆状态 $vehicle = json_decode($contract['cars_info'], true); //获取租赁车辆信息 diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php index 8b45976f3..e41691824 100644 --- a/app/api/controller/JunziqianController.php +++ b/app/api/controller/JunziqianController.php @@ -234,8 +234,12 @@ class JunziqianController extends BaseApiController $response = $requestUtils->doPost("/v2/sign/evidenceLinkFile", $request); if ($response->success) { $resData = (array)$response->data; - $this->getDownload($resData['link'], root_path() . 'public/uploads/vehicle_contract/' . $applyNo . '.png'); - return env('project.website_domain') . '/uploads/vehicle_contract/' . $applyNo . '.png'; + $resArr = []; + foreach($resData['links'] as $k=>$v){ + $this->getDownload($v,root_path() . 'public/uploads/vehicle_contract_evidence/' . $applyNo.'_'.$companyCode.'_'.$k. '.mp4'); + $resArr[] = env('project.website_domain').'/uploads/vehicle_contract_evidence/' . $applyNo.'_'.$companyCode.'_'.$k . '.mp4'; + } + return $resArr; } else { return false; }