From a537f98180ce55a20f7d5feb7751de6ee3bd997d Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Thu, 19 Oct 2023 10:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=96=B0=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=90=88=E5=90=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/contract/VehicleContractController.php       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php
index 23160b405..3c3fcc495 100644
--- a/app/adminapi/controller/contract/VehicleContractController.php
+++ b/app/adminapi/controller/contract/VehicleContractController.php
@@ -144,7 +144,7 @@ class VehicleContractController extends BaseAdminController
         if($contract->isEmpty()){
             return $this->fail('数据不存在');
         }
-        if($contract['status'] != 1){
+        if(!($contract['status'] == 1 || ($contract['status'] == 2 && $contract['signing_timer'] != 2))){
             return $this->fail('合同状态错误');
         }
         $signData = [
@@ -178,13 +178,15 @@ class VehicleContractController extends BaseAdminController
             $contract->save([
                 'id' => $contract['id'],
                 'contract_no' => $signRes->data,
-                'status' => 2
+                'status' => 2,
+	            'signing_timer' => 0
             ]);
             if(!empty($contract['contract_logistic_id'])){
                 curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[
                     'id' => $contract['contract_logistic_id'],
                     'contract_no' => $signRes->data,
                     'status' => 2,
+	                'signing_timer' => 0
                 ]);
             }
             $this->sendSms($params['id'],$smsTitle);