diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 00437e858..c7daf612d 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -142,7 +142,7 @@ class IndexController extends BaseApiController $pro_data[$k]['create_time']=time(); } Db::name('company_property')->insertAll($pro_data); - Db::name('vehicle_rent')->update(['status'=>2,'id'=>$vehicleRent['id']]); + Db::name('vehicle_rent')->update(['status'=>2,'update_time'=>time(),'id'=>$vehicleRent['id']]); } } }catch (\Exception $e){ diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index b712c766d..b42befd37 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -57,4 +57,17 @@ class VehicleController extends BaseApiController return $this->fail($result['msg']); } } + + public function carList():Json { + //获取公司id + $company_id = $this->userInfo['company_id']; + //获取车辆 + $result = VehicleLogic::carList($company_id); + //返回数据 + if($result['code'] == 1){ + return $this->success($result['msg'],$result['data']); + }else{ + return $this->fail($result['msg']); + } + } } \ No newline at end of file diff --git a/app/common/logic/vehicle/VehicleLogic.php b/app/common/logic/vehicle/VehicleLogic.php index 02976d1be..95c661bf4 100644 --- a/app/common/logic/vehicle/VehicleLogic.php +++ b/app/common/logic/vehicle/VehicleLogic.php @@ -64,4 +64,18 @@ class VehicleLogic extends BaseLogic return ['code'=>0,'msg'=>$e->getMessage()]; } } + + public static function carList($company_id) { + $rent = Db::name('vehicle_rent')->where('party_b',$company_id)->where('status',2)->select(); + if($rent->count() <= 0){ + return ['code'=>0,'msg'=>'未查找到车辆']; + } + foreach ($rent as $v) { + $carArr = explode(',',$v['car_ids']); + foreach ($carArr as $cid) { + //请求物流系统获取车辆详情 + //todo + } + } + } } \ No newline at end of file