diff --git a/app/adminapi/controller/contract/ContractController.php b/app/adminapi/controller/contract/ContractController.php index a4f42d9e..5d147478 100644 --- a/app/adminapi/controller/contract/ContractController.php +++ b/app/adminapi/controller/contract/ContractController.php @@ -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){ diff --git a/app/adminapi/lists/vehicle/VehicleLists.php b/app/adminapi/lists/vehicle/VehicleLists.php index f8ea1b92..3330fb8a 100644 --- a/app/adminapi/lists/vehicle/VehicleLists.php +++ b/app/adminapi/lists/vehicle/VehicleLists.php @@ -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();