diff --git a/beike/Admin/Http/Controllers/OrderController.php b/beike/Admin/Http/Controllers/OrderController.php index 8a7f9c33..e7ebd065 100644 --- a/beike/Admin/Http/Controllers/OrderController.php +++ b/beike/Admin/Http/Controllers/OrderController.php @@ -45,7 +45,7 @@ class OrderController extends Controller */ public function export(Request $request) { - $orders = OrderRepo::filterOrders($request->all()); + $orders = OrderRepo::filterAll($request->all()); $items = OrderSimple::collection($orders)->jsonSerialize(); return $this->downloadCsv('orders', $items, 'order'); } diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php index 1443f2d1..ba25485f 100644 --- a/beike/Repositories/OrderRepo.php +++ b/beike/Repositories/OrderRepo.php @@ -11,11 +11,12 @@ namespace Beike\Repositories; -use Beike\Models\Address; use Carbon\Carbon; use Beike\Models\Order; +use Beike\Models\Address; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Contracts\Pagination\LengthAwarePaginator; class OrderRepo @@ -23,12 +24,13 @@ class OrderRepo /** * 获取所有客户订单列表 * - * @return LengthAwarePaginator + * @param array $filters + * @return Builder[]|Collection */ - public static function getListAll(): LengthAwarePaginator + public static function filterAll(array $filters = []) { - $builder = self::getListBuilder()->orderByDesc('created_at'); - return $builder->paginate(); + $builder = self::getListBuilder($filters)->orderByDesc('created_at'); + return $builder->get(); }