|
@@ -96,7 +96,10 @@ class RebateService extends BaseService
|
|
|
$date = Carbon::now('America/New_York')->format('Y-m-d');
|
|
$date = Carbon::now('America/New_York')->format('Y-m-d');
|
|
|
|
|
|
|
|
$paginator = self::model()::where(self::getWhere($search))
|
|
$paginator = self::model()::where(self::getWhere($search))
|
|
|
-// ->where('date', '<', $date)
|
|
|
|
|
|
|
+ ->where('date', '<', $date)
|
|
|
|
|
+ ->orderByDesc('date')
|
|
|
|
|
+ ->orderBy('status')
|
|
|
|
|
+ ->orderByDesc('betting_amount')
|
|
|
->paginate($limit);
|
|
->paginate($limit);
|
|
|
return ['total' => $paginator->total(), 'data' => $paginator->items()];
|
|
return ['total' => $paginator->total(), 'data' => $paginator->items()];
|
|
|
}
|
|
}
|