|
|
@@ -256,6 +256,7 @@ class OrderService extends BaseService
|
|
|
$data = isset($result['data'])?$result['data']:[];
|
|
|
$courierInfo = isset($result['courierInfo'])?$result['courierInfo']:[];
|
|
|
$arrivalTime = isset($result['arrivalTime'])?$result['arrivalTime']:'';
|
|
|
+ $message = isset($result['message'])?$result['message']:'';
|
|
|
$predictedRoute = isset($result['predictedRoute'])?$result['predictedRoute']:[];
|
|
|
$predictedData = $predictedRoute?end($predictedRoute):[];
|
|
|
$arrivalData = [];
|
|
|
@@ -272,7 +273,7 @@ class OrderService extends BaseService
|
|
|
if ($data && $status==200) {
|
|
|
RedisService::set($cacheKey, ['info'=>$courierInfo,'arrivalData'=>$arrivalData,'list'=>$data], 1200);
|
|
|
}else{
|
|
|
- return ['code'=>1,'msg'=>'获取失败:'.Kd100Service::make()->getError()];
|
|
|
+ return ['code'=>1,'msg'=>'获取失败:'.$message];
|
|
|
}
|
|
|
|
|
|
return ['code'=>0,'data'=>['info'=>$courierInfo,'arrivalData'=>$arrivalData,'list'=>$data]];
|