diff --git a/beike/Repositories/RmaReasonRepo.php b/beike/Repositories/RmaReasonRepo.php index f03717cd..9aea3626 100644 --- a/beike/Repositories/RmaReasonRepo.php +++ b/beike/Repositories/RmaReasonRepo.php @@ -17,6 +17,7 @@ use Exception; use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Eloquent\HigherOrderBuilderProxy; use Illuminate\Database\Eloquent\Model; class RmaReasonRepo @@ -72,10 +73,10 @@ class RmaReasonRepo } /** - * @param $data - * @return LengthAwarePaginator + * @param array $data + * @return Builder[]|Collection */ - public static function list($data = []): LengthAwarePaginator + public static function list(array $data = []) { $builder = Rma::query(); @@ -83,6 +84,6 @@ class RmaReasonRepo $builder->where('name', 'like', "%{$data['name']}%"); } - return $builder->paginate(10); + return $builder->get(); } } diff --git a/beike/Shop/Http/Controllers/Account/RmaController.php b/beike/Shop/Http/Controllers/Account/RmaController.php index 5f943c5c..9f89cb68 100644 --- a/beike/Shop/Http/Controllers/Account/RmaController.php +++ b/beike/Shop/Http/Controllers/Account/RmaController.php @@ -12,6 +12,7 @@ namespace Beike\Shop\Http\Controllers\Account; use App\Http\Controllers\Controller; +use Beike\Repositories\RmaReasonRepo; use Beike\Repositories\RmaRepo; use Beike\Shop\Http\Requests\RmaRequest; use Beike\Shop\Services\RmaService; @@ -51,6 +52,7 @@ class RmaController extends Controller $data = [ 'orderProduct' => OrderProductRepo::find($orderProductId), 'statuses' => RmaRepo::getStatuses(), + 'reasons' => RmaReasonRepo::list(), 'types' => RmaRepo::getTypes(), ];