From b53cb00c05871619fc06df508b07fec638c18990 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sat, 9 Sep 2023 20:15:50 +0800
Subject: [PATCH] update notify

---
 .../contract/VehicleContractController.php    |  6 --
 app/api/controller/IndexController.php        | 56 ++++++++++---------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php
index f26397474..b356fcb2e 100644
--- a/app/adminapi/controller/contract/VehicleContractController.php
+++ b/app/adminapi/controller/contract/VehicleContractController.php
@@ -46,12 +46,6 @@ class VehicleContractController extends BaseAdminController
                 ]);
                 VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'cars_info' => $params['cars'],'status'=>1]);
             }else{
-                //更新物流系统
-                curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[
-                    'id' => $vehicle_contract['contract_logistic_id'],
-                    'file' => $params['file'],
-                    'status' => 1,
-                ]);
                 VehicleContract::where('id', $params['id'])->update(['file' => $params['file'],'status'=>1]);
             }
 
diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index 160073372..52b61ba6f 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -164,15 +164,18 @@ class IndexController extends BaseApiController
             $cars = json_decode($contract['cars_info'], true);
             $data = [];
             foreach ($cars as $k => $v) {
-                $data[$k]['car_id'] = $v['id'];
-                $data[$k]['car_license'] = $v['license'];
-                $data[$k]['type'] = 0;
-                $data[$k]['status'] = 0;
-                $data[$k]['company_id'] = $contract['company_b_id'];
-                $data[$k]['rent_time'] = 0;
-                $data[$k]['rent_company_id'] = 0;
-                $data[$k]['contract_id'] = $contract['id'];
-                $data[$k]['create_time'] = strtotime($contract['create_time']);
+                $hasCar = VehicleRent::where('car_id',$v['id'])->find();
+                if($hasCar->isEmpty()){
+                    $data[$k]['car_id'] = $v['id'];
+                    $data[$k]['car_license'] = $v['license'];
+                    $data[$k]['type'] = 0;
+                    $data[$k]['status'] = 0;
+                    $data[$k]['company_id'] = $contract['company_b_id'];
+                    $data[$k]['rent_time'] = 0;
+                    $data[$k]['rent_company_id'] = 0;
+                    $data[$k]['contract_id'] = $contract['id'];
+                    $data[$k]['create_time'] = strtotime($contract['create_time']);
+                }
             }
             $vehicleRent = new VehicleRent();
             $vehicleRent->saveAll($data);
@@ -426,22 +429,25 @@ class IndexController extends BaseApiController
         }
         $cars = json_decode($model['cars_info'], true);
         $result = $model->where('id', $model['id'])->save($param);
-//        if ($result && isset($param['status']) && $param['status'] == 3) {
-//            $data = [];
-//            foreach ($cars as $k => $v) {
-//                $data[$k]['car_id'] = $v['id'];
-//                $data[$k]['car_license'] = $v['license'];
-//                $data[$k]['type'] = 0;
-//                $data[$k]['status'] = 0;
-//                $data[$k]['company_id'] = $model['company_b_id'];
-//                $data[$k]['rent_time'] = 0;
-//                $data[$k]['rent_company_id'] = 0;
-//                $data[$k]['contract_id'] = $model['id'];
-//                $data[$k]['create_time'] = strtotime($model['create_time']);
-//            }
-//            $vehicleRent = new VehicleRent();
-//            $vehicleRent->saveAll($data);
-//        }
+        if ($result && isset($param['status']) && $param['status'] == 3) {
+            $data = [];
+            foreach ($cars as $k => $v) {
+                $hasCar = VehicleRent::where('car_id',$v['id'])->find();
+                if($hasCar->isEmpty()) {
+                    $data[$k]['car_id'] = $v['id'];
+                    $data[$k]['car_license'] = $v['license'];
+                    $data[$k]['type'] = 0;
+                    $data[$k]['status'] = 0;
+                    $data[$k]['company_id'] = $model['company_b_id'];
+                    $data[$k]['rent_time'] = 0;
+                    $data[$k]['rent_company_id'] = 0;
+                    $data[$k]['contract_id'] = $model['id'];
+                    $data[$k]['create_time'] = strtotime($model['create_time']);
+                }
+            }
+            $vehicleRent = new VehicleRent();
+            $vehicleRent->saveAll($data);
+        }
         //返回
         return $result ? $this->success('更新成功') : $this->fail('更新失败');
     }