From 16fc88fb9bba4f395cb3c738023be348ebc4d046 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Wed, 18 Oct 2023 16:52:41 +0800
Subject: [PATCH 1/4] 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 3766daa42..1225e644e 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -385,7 +385,7 @@ class VehicleController extends BaseApiController
         foreach ($vehicleContract_pre as $v) {
             $vehicleBuy = VehicleBuyRecord::where('contract_id',$v['id'])->findOrEmpty();
             if($vehicleBuy->isEmpty()){
-                $vehicleContract = $v;
+                $vehicleContract[] = $v;
             }
         }
         //获取车辆列表

From 38690a5c9a7059cac2fe0e203259501d82596677 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Wed, 18 Oct 2023 17:00:44 +0800
Subject: [PATCH 2/4] update

---
 app/adminapi/controller/contract/VehicleContractController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php
index 6958551ef..d27adea99 100644
--- a/app/adminapi/controller/contract/VehicleContractController.php
+++ b/app/adminapi/controller/contract/VehicleContractController.php
@@ -277,6 +277,9 @@ class VehicleContractController extends BaseAdminController
                     $cars[$k]['type'] = 0;
                 }
                 if($data['type'] == 1){
+					if(empty($v['id'])){
+						$cars[$k]['type'] = 1;
+					}
                     $rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty();
                     if($rentInfo->isEmpty()){
                         $cars[$k]['type'] = 0;

From c8af6af0071ed8b30225228bc6014f47139681e3 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Wed, 18 Oct 2023 17:03:26 +0800
Subject: [PATCH 3/4] update

---
 .../contract/VehicleContractController.php          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php
index d27adea99..23160b405 100644
--- a/app/adminapi/controller/contract/VehicleContractController.php
+++ b/app/adminapi/controller/contract/VehicleContractController.php
@@ -279,13 +279,14 @@ class VehicleContractController extends BaseAdminController
                 if($data['type'] == 1){
 					if(empty($v['id'])){
 						$cars[$k]['type'] = 1;
+					}else{
+						$rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty();
+						if($rentInfo->isEmpty()){
+							$cars[$k]['type'] = 0;
+						}else{
+							$cars[$k]['type'] = $rentInfo['type'];
+						}
 					}
-                    $rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty();
-                    if($rentInfo->isEmpty()){
-                        $cars[$k]['type'] = 0;
-                    }else{
-                        $cars[$k]['type'] = $rentInfo['type'];
-                    }
                 }
                 if($data['type'] == 2){
                     $rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty();

From 60c95e000ee52f9e13cc1c4751cdbbd4f7a9b37e Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Wed, 18 Oct 2023 17:18:43 +0800
Subject: [PATCH 4/4] update

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

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 1225e644e..de0e4ca90 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -778,6 +778,11 @@ class VehicleController extends BaseApiController
                 'update_time' => time(),
             ]);
             //生成关联记录
+	        if($xzRentCars['type'] == 0){
+				$status = 2;
+	        }else{
+		        $status = 1;
+	        }
             VehicleBuyRecord::create([
                 'company_id' => $xzCompany['id'],
                 'company_name' => $xzCompany['company_name'],
@@ -787,7 +792,7 @@ class VehicleController extends BaseApiController
                 'company_email' => $xzCompany['master_email'],
                 'cars_info' => json_encode($cars),
                 'num' => count($cars),
-                'status' => 2,
+                'status' => $status,
                 'contract_id' => $res->id,
                 'create_time' => time()
             ]);