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

update

Browse Source
This commit is contained in:
unknown 2023-09-04 10:18:49 +08:00
parent 16fe469711
commit 74ab85509b
1 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/adminapi/logic/vehicle/VehicleLogic.php
View File

@ -107,8 +107,11 @@ class VehicleLogic extends BaseLogic
//获取车辆状态 //获取车辆状态
$carStatus = (new GpsLogic()) -> status($gpsCarInfo['data']['carId']); $carStatus = (new GpsLogic()) -> status($gpsCarInfo['data']['carId']);
if($carStatus && $gpsCarHistory['code']==1){ if($carStatus && $gpsCarHistory['code']==1){
if(isset($carStatus['carStatus'])){
$gpsCarHistoryData[] = ['lat'=>$carStatus['data']['carStatus']['latc'],'lon'=>$carStatus['data']['carStatus']['lonc']]; $gpsCarHistoryData[] = ['lat'=>$carStatus['data']['carStatus']['latc'],'lon'=>$carStatus['data']['carStatus']['lonc']];
} }
}
} }
$data['track_info'] = $gpsCarHistory&&$gpsCarHistory['code']==1 ? $gpsCarHistoryData : []; $data['track_info'] = $gpsCarHistory&&$gpsCarHistory['code']==1 ? $gpsCarHistoryData : [];
//获取车辆使用情况 //获取车辆使用情况
@ -144,9 +147,12 @@ class VehicleLogic extends BaseLogic
} }
public static function vehicleLogisticLists($params){ public static function vehicleLogisticLists($params){
$pageNo = isset($params['page_no']) ? $params['page_no'] : 1;
$pageSize = isset($params['page_size']) ? $params['page_size'] : 15;
$info = Vehicle::field('id,license,status,type')->findOrEmpty($params['id'])->toArray(); $info = Vehicle::field('id,license,status,type')->findOrEmpty($params['id'])->toArray();
$rent = VehicleRent::field('use_user_id,use_user_name,use_user_phone')->where('car_id',$info['id'])->findOrEmpty()->toArray(); $rent = VehicleRent::field('use_user_id,use_user_name,use_user_phone')->where('car_id',$info['id'])->findOrEmpty()->toArray();
$data = array_merge($info,$rent); $data = array_merge($info,$rent);
if(!empty($rent)){
$data['total_package'] = Logistics::field('order_id')->where('courier_id',$data['use_user_id'])->where('status',1)->count(); $data['total_package'] = Logistics::field('order_id')->where('courier_id',$data['use_user_id'])->where('status',1)->count();
$goodsTotal = 0; $goodsTotal = 0;
Logistics::field('order_id')->where('courier_id',$data['use_user_id'])->where('status',1)->select()->each(function($item)use(&$goodsTotal){ Logistics::field('order_id')->where('courier_id',$data['use_user_id'])->where('status',1)->select()->each(function($item)use(&$goodsTotal){
@ -162,8 +168,6 @@ class VehicleLogic extends BaseLogic
$goodsTotal += $case['count']; $goodsTotal += $case['count'];
}); });
$data['total_goods'] = $goodsTotal; $data['total_goods'] = $goodsTotal;
$pageNo = isset($params['page_no']) ? $params['page_no'] : 1;
$pageSize = isset($params['page_size']) ? $params['page_size'] : 15;
//获取物流信息 //获取物流信息
$logistic = Logistics::field('order_id,order_sn,shop_name,user_name,receiver_address,qh_time,ps_time')->where('courier_id',$data['use_user_id'])->where('status',1)->page($pageNo,$pageSize)->order('qh_time desc')->select()->each(function($item){ $logistic = Logistics::field('order_id,order_sn,shop_name,user_name,receiver_address,qh_time,ps_time')->where('courier_id',$data['use_user_id'])->where('status',1)->page($pageNo,$pageSize)->order('qh_time desc')->select()->each(function($item){
$qhTime = !empty($item['qh_time']) ? strtotime($item['qh_time']) : time(); $qhTime = !empty($item['qh_time']) ? strtotime($item['qh_time']) : time();
@ -181,6 +185,12 @@ class VehicleLogic extends BaseLogic
}); });
$item['product_count'] = $product_count; $item['product_count'] = $product_count;
})->toArray(); })->toArray();
}else{
$data['total_package'] = [];
$data['total_goods'] = [];
$logistic = [];
}
return ['basic'=>$data,'lists'=>$logistic,'count'=>$data['total_package'],'page_no'=>$pageNo,'page_size'=>$pageSize]; return ['basic'=>$data,'lists'=>$logistic,'count'=>$data['total_package'],'page_no'=>$pageNo,'page_size'=>$pageSize];
} }