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-08-31 13:41:04 +08:00
parent 4c3042b049
commit e57a1d4d60
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/controller/contract/ContractController.php
View File

@ -131,7 +131,7 @@ class ContractController extends BaseAdminController
}
$pageNo = !empty($param['page_no']) ? $param['page_no'] : 1;
$pageSize = !empty($param['page_size']) ? $param['page_size'] : 15;
$data = Contract::where($where)
$data = Contract::whereor($where)
->page($pageNo, $pageSize)
->order('create_time desc')
->select()->each(function($item){

17
app/adminapi/lists/vehicle/VehicleLists.php
View File

@ -52,7 +52,22 @@ class VehicleLists extends BaseAdminDataLists implements ListsSearchInterface
->each(function($item){
$item['status_name'] = $item->status_name;
$item['type_name'] = $item->type_name;
$item['mileage'] = 0;
if($item['status'] == 2){
$item['rent_info'] = VehicleRent::where('car_id',$item['id'])->find();
$goodsTotal = 0;
Logistics::field('order_id')->where('courier_id',$item['rent_info']['use_user_id'])->where('status',1)->select()->each(function($case)use(&$goodsTotal){
$count = 0;
Product::field('product_num,cart_info')->where('order_id', $case['order_id'])->select()->each(function($pro_item)use(&$count){
$pro_item['cart_info'] = json_decode($pro_item['cart_info'], true);
$count += $pro_item['product_num'];
unset($pro_item['cart_info']);
})->toArray();
$case['count'] = $count;
$goodsTotal += $case['count'];
})->toArray();
$item['goodsTotal'] = $goodsTotal;
}
return $item;
})
->toArray();