wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed export order

This commit is contained in:
Edward Yang 2022-08-24 12:04:27 +08:00
parent c85159de1b
commit 9c6c38aef4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beike/Admin/Http/Controllers/OrderController.php
View File

@ -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');
}

12
beike/Repositories/OrderRepo.php
View File

@ -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();
}