From 7d13753dd91f40d9452ea413d2de7a212cbd8ac8 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sat, 9 Sep 2023 14:35:02 +0800
Subject: [PATCH] patch

---
 .../contract/VehicleContractController.php    |  5 +++++
 app/api/controller/IndexController.php        | 22 +++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php
index 92cf31c9e..f26397474 100644
--- a/app/adminapi/controller/contract/VehicleContractController.php
+++ b/app/adminapi/controller/contract/VehicleContractController.php
@@ -172,6 +172,11 @@ class VehicleContractController extends BaseAdminController
                 'contract_no' => $signRes->data,
                 'status' => 2
             ]);
+            curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[
+                'id' => $contract['contract_logistic_id'],
+                'contract_no' => $signRes->data,
+                'status' => 2,
+            ]);
             $this->sendSms($params['id'],'《租赁合同》');
             return $this->success('合同发送成功');
         } else {
diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index ea7ef4adb..6d1ce74e0 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -137,7 +137,7 @@ class IndexController extends BaseApiController
             //更新本地合同状态
             $updateLocalRes = VehicleContract::where('id',$contract['id'])->update(['signing_timer'=>1]);
             //更新远程
-            $updateSverRes =curl_post(env('project.logistic_domain').'/api/index/notifyContractUpdate',[],[
+            $updateSverRes =curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[
                 'id' => $contract['contract_logistic_id'],
                 'signing_timer' => 1,
             ]);
@@ -145,13 +145,27 @@ class IndexController extends BaseApiController
                 return json(['success' => false, 'msg' => '更新失败']);
             }
         }else if($contract['signing_timer'] == 1){
+            //获取签约后的合同
+            $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
+            ]);
             //更新本地合同状态
-            $updateLocalRes = VehicleContract::where('id',$contract['id'])->update(['signing_timer'=>2,'status' => 3]);
+            $updateLocalRes = VehicleContract::where('id',$contract['id'])->update(['signing_timer'=>2,'status' => 3,'contract_url'=>$signContractFile,'contract_evidence'=>$contractEvidence]);
             //更新远程
-            $updateSverRes =curl_post(env('project.logistic_domain').'/api/index/notifyContractUpdate',[],[
+            $updateSverRes =curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[
                 'id' => $contract['contract_logistic_id'],
                 'signing_timer' => 2,
-                'status' => 3
+                'status' => 3,
+                'contract_url'=>$signContractFile,
+                'contract_evidence'=>$contractEvidence
             ]);
             if(!$updateLocalRes || $updateSverRes['code']==0){
                 return json(['success' => false, 'msg' => '更新失败']);