From 0bb13c8bc9bf48db5183780dc48760f8e1fb0b5d Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 1 Sep 2023 17:45:27 +0800
Subject: [PATCH 1/9] update

---
 app/api/controller/VehicleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 376c07975..0e5aaff10 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -210,7 +210,7 @@ class VehicleController extends BaseApiController
             return $this->fail('当前小组服务公司未签约');
         }
         //获取签约信息
-        $contract = VehicleContract::where('party_b',$this->userInfo['company_id'])->where('signing_timer',2)->find();
+        $contract = Contract::where('party_b',$this->userInfo['company_id'])->where('signing_timer',2)->find();
         $party_a = Company::field('id,company_name,master_name,master_phone,master_email,is_contract,organization_code,company_type')->where('id',$contract['party_a'])->find();
         if(empty($contract) || empty($party_a)){
             return $this->fail('未找到签约镇街公司');

From ed5166f8fa1884ccf4eb85646366954b3d6656c1 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 1 Sep 2023 17:47:12 +0800
Subject: [PATCH 2/9] update

---
 app/api/controller/IndexController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 2c6e69a69..1f9f56b16 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -295,6 +295,9 @@ class IndexController extends BaseApiController
             return $this->fail('请求方式错误');
         }
         $param = $this->request->post();
+        if(empty($param['contract_logistic_id'])){
+            return $this->fail('缺少必要参数');
+        }
         $model = VehicleContract::where('contract_logistic_id',$param['contract_logistic_id'])->find();
         if(empty($model)){
             return $this->fail('数据不存在');

From 975333cc753081bc4bed68420ebd43e2d9fd03f3 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 1 Sep 2023 17:55:12 +0800
Subject: [PATCH 3/9] update

---
 app/api/controller/VehicleController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 0e5aaff10..b79ff14c2 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -519,12 +519,13 @@ class VehicleController extends BaseApiController
     }
 
     public function townCompanyContractList() {
+        //获取公司信息
         $company = Company::where('id',$this->userInfo['company_id'])->find();
         if(empty($company)){
             return $this->fail('请求错误');
         }
         if($company['company_type'] != 16){
-            return ['code'=>0,'msg'=>'非镇街公司不能访问'];
+            return $this->fail('非镇街公司不能访问');
         }
         $data = VehicleContract::field('id,contract_no,file,status,create_time,update_time')->where('contract_logistic_id','<>',0)->where('company_b_id',$company['id'])->select();
         return $this->success('请求成功',$data->toArray());

From 5ec3c635f5967031b046caddf449116c3685cf9b Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 1 Sep 2023 20:38:12 +0800
Subject: [PATCH 4/9] update

---
 app/api/controller/VehicleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index b79ff14c2..9a22ceac3 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -376,7 +376,7 @@ class VehicleController extends BaseApiController
             return $this->fail('非小组公司不能访问');
         }
         //获取申请信息
-        $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->order('id desc')->find();
+        $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->where('type','<>',2)->order('id desc')->find();
         if(empty($vehicleContract)){
             return $this->success('没有数据，请申请');
         }

From ede6904ef38099e287d67fc7181a5b1ffa5ce187 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 1 Sep 2023 20:41:20 +0800
Subject: [PATCH 5/9] update

---
 app/api/controller/VehicleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 9a22ceac3..22e0446c8 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -380,7 +380,7 @@ class VehicleController extends BaseApiController
         if(empty($vehicleContract)){
             return $this->success('没有数据，请申请');
         }
-        if($vehicleContract['status'] == 3){
+        if($vehicleContract['status'] == 2){
             if(!empty($vehicleContract['cars_info'])){
                 $vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true);
                 if(!empty($vehicleContract['cars_info'])){

From 0db1378223f7359df1397a199cc553a357f851ac Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 1 Sep 2023 20:49:33 +0800
Subject: [PATCH 6/9] update

---
 app/api/controller/VehicleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 22e0446c8..73fd8e2d6 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -378,7 +378,7 @@ class VehicleController extends BaseApiController
         //获取申请信息
         $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->where('type','<>',2)->order('id desc')->find();
         if(empty($vehicleContract)){
-            return $this->success('没有数据，请申请');
+            return $this->success('没有数据，请申请',['status'=>-1]);
         }
         if($vehicleContract['status'] == 2){
             if(!empty($vehicleContract['cars_info'])){

From bdec0d3dd7e51c766bad5a7ff00d980edb2bd2a6 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 1 Sep 2023 21:02:59 +0800
Subject: [PATCH 7/9] update

---
 app/api/controller/VehicleController.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 73fd8e2d6..a72715903 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -376,11 +376,14 @@ class VehicleController extends BaseApiController
             return $this->fail('非小组公司不能访问');
         }
         //获取申请信息
-        $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->where('type','<>',2)->order('id desc')->find();
+        $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->order('id desc')->find();
         if(empty($vehicleContract)){
             return $this->success('没有数据，请申请',['status'=>-1]);
         }
-        if($vehicleContract['status'] == 2){
+        if($vehicleContract['type'] == 2){
+            return $this->success('合同已解除',['status'=>-1]);
+        }
+        if($vehicleContract['status'] == 3){
             if(!empty($vehicleContract['cars_info'])){
                 $vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true);
                 if(!empty($vehicleContract['cars_info'])){

From e5ef88b56a8863957126f5d6c157cef2c68e6efb Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 1 Sep 2023 21:14:53 +0800
Subject: [PATCH 8/9] update

---
 app/api/controller/IndexController.php   | 4 ++++
 app/api/controller/VehicleController.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 1f9f56b16..8559f354f 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -275,6 +275,10 @@ class IndexController extends BaseApiController
             VehicleContract::where('id',$id)->update(['signing_timer'=>2,'status'=>3]);
             //更改租赁列表车辆状态
             $vehicle = json_decode($contract['cars_info'],true);
+            //获取租赁车辆信息
+            $vehicleRentInfo = VehicleRent::where('car_id',$vehicle['id'])->find();
+            //更新原始合同类型
+            VehicleContract::where('id',$vehicleRentInfo['contract_id'])->update(['type'=>2]);
             VehicleRent::where('car_id',$vehicle['id'])->update([
                 'status' => 3,
             ]);
diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index a72715903..758797dfd 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -222,7 +222,7 @@ class VehicleController extends BaseApiController
             return $this->fail('当前镇街公司未签约');
         }
         //判断是否申请过
-        $vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('status','<>',4)->find();
+        $vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('type','<>',2)->where('status','<>',4)->find();
         if(!empty($vehicleContract)){
             return $this->fail('请勿重复申请');
         }

From af02ae531204ee9fee670a12b4998fbe6e1f898c Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sat, 2 Sep 2023 09:35:59 +0800
Subject: [PATCH 9/9] update

---
 app/api/controller/VehicleController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 758797dfd..565ab429e 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -378,10 +378,10 @@ class VehicleController extends BaseApiController
         //获取申请信息
         $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->order('id desc')->find();
         if(empty($vehicleContract)){
-            return $this->success('没有数据，请申请',['status'=>-1]);
+            return $this->success('没有数据，请申请',['status'=>-2]);
         }
         if($vehicleContract['type'] == 2){
-            return $this->success('合同已解除',['status'=>-1]);
+            return $this->success('合同已解除',['status'=>-3]);
         }
         if($vehicleContract['status'] == 3){
             if(!empty($vehicleContract['cars_info'])){