mkm/logistics
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
unknown 2023-08-24 15:47:33 +08:00
parent f1edb70827
commit eaa8b601c4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/controller/VehicleController.php
View File

@ -102,8 +102,8 @@ class VehicleController extends BaseApiController
//获取车辆当前位置
public function getCarLocal():Json {
$params = $this->request->get(['car_id','gps_imei']);
if(empty($params['car_id']) || empty($params['gps_imei'])){
$params = $this->request->get(['car_id']);
if(empty($params['car_id'])){
return $this->fail('缺少必要参数');
}
$result = VehicleLogic::getCarLocal($params);

5
app/api/logic/VehicleLogic.php
View File

@ -206,8 +206,7 @@ class VehicleLogic extends BaseLogic
public static function getCompanyCars($params):array {
$company_str = $params['company_type'] == 1 ? 'lessee_one_company_id' : 'lessee_two_company_id';
$data = VehicleRent::where($company_str,$params['company_id'])->select()->each(function($item){
$car = Vehicle::field('license,gps_imei')->where('id',$item['car_id'])->find();
$item['gps_imei'] = $car['gps_imei'];
$car = Vehicle::field('license')->where('id',$item['car_id'])->find();
$item['license'] = $car['license'];
return $item;
});
@ -219,7 +218,7 @@ class VehicleLogic extends BaseLogic
}
public static function getCarLocal($params):array {
$car = Vehicle::field('gps_carid')->where('id',$params['car_id'])->where('gps_imei',$params['gps_imei'])->find();
$car = Vehicle::field('gps_carid')->where('id',$params['car_id'])->find();
if(!$car){
return ['code'=>0,'msg'=>'车辆不存在'];
}