u

app/Services/RebateService.php

@@ -65,21 +65,21 @@ class RebateService extends BaseService
      */
     public static function findAll(array $search = [])
     {
-        return self::model()::where(self::getWhere($search))->get();
+        return self::$MODEL::where(self::getWhere($search))->get();
     }
 
     /**
      * @description: 分页查询
      * @param array $search
-     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+     * @return array
      */
-    public static function paginate(array $search = [])
+    public static function paginate(array $search = []): array
     {
         $limit = isset($search['limit']) ? $search['limit'] : 15;
         $date = Carbon::now('America/New_York')->format('Y-m-d');
 
-        $paginator = static::model()::where(self::getWhere($search))
-            ->where('date', '<', $date)
+        $paginator = static::$MODEL::where(self::getWhere($search))
+//            ->where('date', '<', $date)
             ->orderByDesc('date')
             ->orderBy('status')
             ->orderByDesc('betting_amount')