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] 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('请勿重复申请');
}