From ffe0042ed04bcd0c0ba7e049849db38445ab7636 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 22 Aug 2023 16:37:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/RemoteController.php | 5 ++---
 app/api/controller/TaskController.php   | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/api/controller/RemoteController.php b/app/api/controller/RemoteController.php
index 838ad9129..2106fa193 100644
--- a/app/api/controller/RemoteController.php
+++ b/app/api/controller/RemoteController.php
@@ -11,7 +11,7 @@ class RemoteController extends BaseApiController
 
     public array $notNeedLogin = ['index'];
 
-    public function shang_date_total_price($company,$is_day=1,$arr)
+    public function shang_date_total_price($company,$is_day,$arr)
     {
         if($is_day==1){
             $start_time = date('Y-m-d');
@@ -165,12 +165,12 @@ class RemoteController extends BaseApiController
      * 获取坐标的距离
      */
     public function coordinate($parmas,$longitude1,$latitude1){
-
         $res = HttpClient::create()->request('GET', 'http://logistics.lihaink.cn/api/getCarHistory', [
             'query' => $parmas,
         ]);
         $json=json_decode($res->getContent(),true);
         $points=$json['data'];
+
         $target =[
             "lat"=> $latitude1,
             "lon"=> $longitude1
@@ -191,7 +191,6 @@ class RemoteController extends BaseApiController
         foreach ($points as $point) {
             // halt($point,$target);
             $distance = sqrt(pow(($point['lat'] - $target['lat']), 2) + pow(($point['lon'] - $target['lon']), 2));
-    
             if ($distance < $minDistance) {
                 $minDistance = $distance;
                 $closestPoint = $point;
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 95cd5b499..ef7d18ffa 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -99,13 +99,18 @@ class TaskController extends BaseApiController
     {
         $parmas = $this->request->param();
         $task = Task::where('id', $parmas['id'])->find()->toArray();
+        $datas=[
+            'car_id'=>3,
+            'start_time'=>'2023-08-18',
+            'end_time'=>'2023-08-18 23:59:59'
+        ];
         $data['status'] = 2;
         if (isset($parmas['terminus'])) {
-            $res = App(RemoteController::class)->coordinate($parmas, $parmas['terminus']['lnglat'][0], ['terminus']['lnglat'][1]);
+            $res = App(RemoteController::class)->coordinate($datas, $parmas['terminus']['lnglat'][0],  $parmas['terminus']['lnglat'][1]);
             $task['extend']['update']['terminus']['lnglat'] = $parmas['terminus'];
         }
         if (isset($parmas['transfer'])) {
-            $res = App(RemoteController::class)->coordinate($parmas, $parmas['transfer']['lnglat'][0], ['transfer']['lnglat'][1]);
+            $res = App(RemoteController::class)->coordinate($datas, $parmas['transfer']['lnglat'][0],  $parmas['transfer']['lnglat'][1]);
             $task['extend']['update']['transfer']['lnglat'] = $parmas['transfer'];
         }
         if (isset($task['extend']['update']['terminus']) && isset($task['extend']['update']['transfer'])) {