From 9b1597dadcba2106cb7b805ab21003a8aedb5f9f Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sat, 26 Aug 2023 11:15:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BD=A6=E8=BE=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/VehicleController.php  | 12 ++++++++++--
 app/common/logic/vehicle/VehicleLogic.php | 24 +++++++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index b42befd37..440568017 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -59,10 +59,18 @@ class VehicleController extends BaseApiController
     }
 
     public function carList():Json {
+        //获取参数
+        $params = $this->request->get(['is_rent','license','company_name','page_no','page_size']);
+        if(empty($params['is_rent'])){
+            return $this->fail('缺少必要参数');
+        }
+        if(!in_array($params['is_rent'],[1,2])){
+            return $this->fail('参数错误');
+        }
         //获取公司id
-        $company_id = $this->userInfo['company_id'];
+        $params['company_id'] = $this->userInfo['company_id'];
         //获取车辆
-        $result = VehicleLogic::carList($company_id);
+        $result = VehicleLogic::carList($params);
         //返回数据
         if($result['code'] == 1){
             return $this->success($result['msg'],$result['data']);
diff --git a/app/common/logic/vehicle/VehicleLogic.php b/app/common/logic/vehicle/VehicleLogic.php
index 95c661bf4..a34a295b2 100644
--- a/app/common/logic/vehicle/VehicleLogic.php
+++ b/app/common/logic/vehicle/VehicleLogic.php
@@ -65,17 +65,21 @@ class VehicleLogic extends BaseLogic
         }
     }
 
-    public static function carList($company_id) {
-        $rent = Db::name('vehicle_rent')->where('party_b',$company_id)->where('status',2)->select();
-        if($rent->count() <= 0){
-            return ['code'=>0,'msg'=>'未查找到车辆'];
-        }
-        foreach ($rent as $v) {
-            $carArr = explode(',',$v['car_ids']);
-            foreach ($carArr as $cid) {
-                //请求物流系统获取车辆详情
-                //todo
+    public static function carList($params):array {
+        //请求物流系统获取车辆详情
+        $result = curl_post('http://www.lst.local/api/companyCarList',[],$params);
+        if($result['code'] == 1){
+            foreach ($result['data'] as $k=>$v){
+                if($v['lessee_two_flag'] == 1){
+                    $lessee_two_company = Company::where('id','lessee_two_company_id')->find();
+                    $result['data'][$k]['lessee_two_company_address'] = $lessee_two_company['address'];
+                }else{
+                    $result['data'][$k]['lessee_two_company_address'] = '';
+                }
             }
+            return ['code'=>1,'msg'=>'请求成功','data'=>$result['data']];
+        }else{
+            return ['code'=>0,'msg'=>'请求失败'];
         }
     }
 }
\ No newline at end of file