From 414f6435cad6c610a8f923260701f64d633fbfb1 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Wed, 18 Oct 2023 09:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=AD=E4=B9=B0=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E8=BD=A6=E8=BE=86=E6=95=B0=E9=87=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/IndexController.php   | 10 +++++-----
 app/api/controller/VehicleController.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 3d4cc903d..dc69fdbca 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -486,11 +486,6 @@ class IndexController extends BaseApiController
                 if($vehicleBuyRecord['status'] == 2){
                     //获取租赁车辆信息
                     $rentCarsInfo = VehicleRent::where('car_id',$cars_ids[0])->findOrEmpty();
-                    //获取镇街公司信息
-                    $zjCompany = Company::where('id',$rentCarsInfo['company_id'])->findOrEmpty();
-                    //判断购买车辆中是否包含镇街公司租赁的车辆
-                    $car_ids = array_column(json_decode($vehicleBuyRecord['cars_info'],true),'id');
-                    $zjRentCars = VehicleRent::field('car_id as id,car_license as license')->where('company_id',$zjCompany['id'])->where('car_id','in',$car_ids)->where('status',0)->where('type',0)->select();
                     if($rentCarsInfo['type'] == 0){
                         //修改租赁车俩状态
                         VehicleRent::where('id',$rentCarsInfo['id'])->update(['status'=>0,'rent_company_id'=>0,'rent_contract_id'=>0,'rent_time'=>0]);
@@ -505,6 +500,11 @@ class IndexController extends BaseApiController
                     curl_post(env('project.logistic_domain').'/api/Vehicle/delRentUseInfo', [], [
                         'car_id' => $cars_ids[0]
                     ]);
+                    //获取镇街公司信息
+                    $zjCompany = Company::where('id',$rentCarsInfo['company_id'])->findOrEmpty();
+                    //判断购买车辆中是否包含镇街公司租赁的车辆
+                    $car_ids = array_column(json_decode($vehicleBuyRecord['cars_info'],true),'id');
+                    $zjRentCars = VehicleRent::field('car_id as id,car_license as license')->where('company_id',$zjCompany['id'])->where('car_id','in',$car_ids)->where('status',0)->where('type',0)->select();
                     //发送镇公司与平台公司的解约合同
                     $curl_result = curl_post(env('project.logistic_domain').'/api/signContract',[],[
                         'num' => count($zjRentCars),
diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 30c1d17e2..f5a6f5b58 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -779,7 +779,7 @@ class VehicleController extends BaseApiController
                 'company_email' => $xzCompany['master_email'],
                 'cars_info' => json_encode($cars),
                 'num' => count($cars),
-                'status' => 1,
+                'status' => 2,
                 'contract_id' => $res->id,
                 'create_time' => time()
             ]);