From 8c4b9f7bd230c85c9daf835b9772b157bcc98b02 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sat, 14 Oct 2023 09:56:30 +0800
Subject: [PATCH 1/2] fixed buycar

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

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 5f24547f1..606ea14bd 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -419,9 +419,17 @@ class VehicleController extends BaseApiController
         if($company['company_type'] != 18 ){
             return $this->fail('非小组公司不能访问');
         }
+        //获取购买车辆记录
+        $buyCarRent = VehicleBuyRecord::where('company_id',$company['id'])->where('status','<>',4)->findOrEmpty();
+        if($buyCarRent->isEmpty()){
+            $data = VehicleContract::where('company_b_id',$company['id'])->where('type','<>',2)->order('id desc')->findOrEmpty();
+        }else{
+            $data = $buyCarRent;
+            $data['status'] = 0;
+            $data['type'] = 0;
+        }
         //获取签约合同
-        $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->where('type','<>',2)->order('id desc')->findOrEmpty();
-        return $this->success('请求成功',$vehicleContract->toArray());
+        return $this->success('请求成功',$data->toArray());
     }
 
     //车辆详情

From df77185f6cbf78c84c0dccc32a881c02b7aa8274 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Mon, 16 Oct 2023 13:34:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=AF=E5=9C=A8=E7=A7=9F=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E5=8F=96=E5=80=BC=E4=B8=BA=E8=B4=9F=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 606ea14bd..a30a26e2f 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -30,7 +30,7 @@ class VehicleController extends BaseApiController
         //自有车辆数量
         $selfCar = VehicleRent::field('id')->where('company_id',$this->userInfo['company_id'])->where('status','<>',3)->where('type',1)->count();
         //可在租车辆
-        $doubleRentCar = $villageCompany - $rentCar - $applyCar - $selfCar;
+        $doubleRentCar = max($villageCompany - $rentCar - $applyCar - $selfCar,0);
         if($params['num'] > $doubleRentCar ){
             return $this->fail('数量超过可再租车辆数');
         }
@@ -395,7 +395,7 @@ class VehicleController extends BaseApiController
         //自有车辆数量
         $selfCar = VehicleRent::field('id')->where('company_id',$company['id'])->where('status','<>',3)->where('type',1)->count();
         //可在租车辆
-        $doubleRentCar = $villageCompany - $rentCar - $applyCar - $selfCar;
+        $doubleRentCar = max($villageCompany - $rentCar - $applyCar - $selfCar,0);
         //设置数据
         $data = [
             'apply' => $vehicleContract,