diff --git a/app/controller/VehicleController.php b/app/controller/VehicleController.php index 14bb1be..5f73139 100644 --- a/app/controller/VehicleController.php +++ b/app/controller/VehicleController.php @@ -404,9 +404,10 @@ class VehicleController /** * Get a specific vehicle with its location */ - public function show(Request $request, $id) + public function show(Request $request) { $lang = $request->post('lang', 'zh'); + $id = $request->post('id'); switch ($lang) { case 'zh': @@ -433,6 +434,30 @@ class VehicleController if (isset($vehicle->vin)) { $vehicle->vin = $this->maskVin($vehicle->vin); } + + if(is_numeric($vehicle->status)) { + $vehicle->status = $this->status[$lang][$vehicle->status]??$this->status[$lang][0]; + } + $vehicle['vin'] = $vehicle['vin']??''; + $vehicle['brand'] = $vehicle['brand']??''; + $vehicle['model'] = $vehicle['model']??''; + if(!empty($vehicle['img_url'])) { + $img_url = Cache::get('img_dib_'.$vehicle->id); + if ($img_url) { + $vehicle['img_url'] = $img_url; + } else { + $ossservice = empty($ossservice)?new OssService():$ossservice; + $img_url = $ossservice->generatePrivateUrl($vehicle['img_url'],86400); + $vehicle['img_url'] = $img_url; + Cache::set('img_dib_'.$vehicle->id, $img_url, 86390); + } + }else{ + $vehicle['img_url'] = ''; + } + if(!empty($vehicle['ship_id'])){ + $vehicle['ship'] = LogisticsShip::find($vehicle['ship_id']); + } + return Util::success($vehicle); }