From 50228d09682bd9ce3d50d3ebc66e3e8bf75e5e6f Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Thu, 7 Sep 2023 13:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=87=AA=E6=9C=89=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/IndexController.php   |  1 +
 app/api/controller/VehicleController.php | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 669cab796..c5ad73265 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -250,6 +250,7 @@ class IndexController extends BaseApiController
             $vehicle = json_decode($contract['cars_info'], true);
             $curl_res = curl_post(env('project.logistic_domain').'/api/addSelfCar', [], [
                 'license' => $vehicle['license'],
+                'pic' => $vehicle['pic'],
                 'company_id' => $contract['company_a_id'],
                 'company_name' => $contract['company_a_name'],
                 'company_user' => $contract['company_a_user'],
diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 285d7548b..10fa50f75 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -204,7 +204,12 @@ class VehicleController extends BaseApiController
             return $this->fail('请求类型错误');
         }
         //获取参数
-        $license = $this->request->post('license');
+        $params = $this->request->post(['type','license','pic']);
+        if($params['type'] == 1){
+            if(empty($params['license']) || empty($params['pic'])){
+                return $this->fail('缺少必要参数');
+            }
+        }
         //获取当前公司信息
         $party_b = Company::field('id,company_name,master_name,master_phone,master_email,is_contract,organization_code,company_type')->where('id',$this->userInfo['company_id'])->find();
         if(empty($party_b)){
@@ -233,6 +238,13 @@ class VehicleController extends BaseApiController
         if(!empty($vehicleContract)){
             return $this->fail('请勿重复申请');
         }
+        if($params['type'] == 1){
+            $cars_info = json_encode(['license'=>$params['license'],'pic'=>$params['pic']]);
+            $car_type = 1;
+        }else{
+            $cars_info = null;
+            $car_type = 0;
+        }
         //设置数据
         $data = [
             'contract_logistic_id' => 0,
@@ -249,9 +261,9 @@ class VehicleController extends BaseApiController
             'company_b_user' => $party_b['master_name'],
             'company_b_phone' => $party_b['master_phone'],
             'company_b_email' => $party_b['master_email'],
-            'cars_info' => isset($license) ? json_encode(['license'=>$license]) : null,
+            'cars_info' => $cars_info,
             'num' => 1,
-            'type' => isset($license) ? 1 : 0,
+            'type' => $car_type,
             'status' => -1,
             'create_time' => time(),
             'update_time' => time()