Wesmiler

app/Services/Api/OrderService.php

@@ -839,16 +839,25 @@ class OrderService extends BaseService
         $status = isset($result['status'])?$result['status']:0;
         $data = isset($result['data'])?$result['data']:[];
         $courierInfo = isset($result['courierInfo'])?$result['courierInfo']:[];
+        $arrivalTime = isset($result['arrivalTime'])?$result['arrivalTime']:'';
+        $predictedRoute = isset($result['predictedRoute'])?$result['predictedRoute']:[];
+        $predictedData = $predictedRoute?end($predictedRoute):[];
+        $arrivalData = [];
+        if($arrivalTime){
+            $arrivalData['arrivalTime'] =  $arrivalTime;
+            $arrivalData['predictedData'] =  $predictedData;
+        }
+
         if($courierInfo && $courierInfo['deliveryManPhone']){
             $courierInfo['deliveryManPhone'] = explode(',', $courierInfo['deliveryManPhone']);
             $courierInfo['deliveryPhone'] = $courierInfo['deliveryManPhone'][1]?$courierInfo['deliveryManPhone'][1]:$courierInfo['deliveryManPhone'][0];
         }
 
         if ($data && $status==200) {
-            RedisService::set($cacheKey, ['info'=>$courierInfo,'list'=>$data], 1200);
+            RedisService::set($cacheKey, ['info'=>$courierInfo,'arrivalData'=>$arrivalData,'list'=>$data], 1200);
         }
 
-        return $data?['info'=>$courierInfo,'list'=>$data]:[];
+        return $data?['info'=>$courierInfo,'arrivalData'=>$arrivalData,'list'=>$data]:[];
 
     }