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

Merge pull request 'update' (#3) from dev into preview

Browse Source 
Reviewed-on: #3
This commit is contained in:
weiz 2023-09-22 16:18:06 +08:00
commit 20ca18fc7c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@ class VehicleLogic extends BaseLogic
public static function vehicleLogisticDetail($params){
$info = Vehicle::field('id,license,status,type')->findOrEmpty($params['car_id'])->toArray();
$rent = VehicleRent::field('use_user_id,use_user_name,use_user_phone')->where('car_id',$info['id'])->findOrEmpty()->toArray();
$logistic = Logistics::field('order_sn,user_name,receiver_address,shop_name,shop_address,create_time,qh_time')->where('order_id',$params['order_id'])->findOrEmpty()->toArray();
$logistic = Logistics::field('order_sn,user_name,receiver_address,shop_name,shop_address,create_time,qh_time')->where('courier_id',$rent['use_user_idgit'])->where('order_id',$params['order_id'])->findOrEmpty()->toArray();
$qhTime = !empty($logistic['qh_time']) ? strtotime($logistic['qh_time']) : time();
$diffTime = timeDiff($qhTime,time());
$logistic['diff_time'] = $diffTime['day'].'天'.$diffTime['hour'].'小时'.$diffTime['min'].'分钟'.$diffTime['sec'].'秒';