1、修复分页功能 2、增加查看日志

server/app/Http/Controllers/V1/BhOrdersController.php

@@ -98,9 +98,14 @@ class BhOrdersController extends Controller
      */
     public function getBhSorderRefundTaskToPage(Request $request)
     {
+        $message = [
+            'type.required' => "类型无效",
+        ];
+        $this->validateRequest($request, $message);
+
         try{
-            $order = $this->bhOrdersService->getSordersRefundTask($request);
-            return Response::success($order, '添加成功');
+            $task = $this->bhOrdersService->getSordersRefundTask($request);
+            return Response::success($task, '添加成功');
         }catch(\Exception $exception){
             return Response::fail($exception->getMessage(),500);
         }
@@ -145,4 +150,19 @@ class BhOrdersController extends Controller
             return Response::fail($exception->getMessage(),500);
         }
     }
+
+    public function getSorderRefundTaskLogsToPage(Request $request)
+    {
+        $message = [
+            'taskId.required' => "任务id必填",
+        ];
+        $this->validateRequest($request, $message);
+
+        try{
+            $logs = $this->bhOrdersService->getBhSorderTaskLog($request);
+            return Response::success($this->formatKeysfromArray($logs), '操作成功');
+        }catch(\Exception $exception){
+            return Response::fail($exception->getMessage(),500);
+        }
+    }
 }

server/app/Repositories/Eloquent/BaseRepository.php

@@ -13,6 +13,7 @@ namespace App\Repositories\Eloquent;
 
 use App\Repositories\Presenters\Presenter;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Prettus\Repository\Eloquent\BaseRepository as BaseRepositoryEloquent;
 
 abstract class BaseRepository extends BaseRepositoryEloquent
@@ -25,17 +26,16 @@ abstract class BaseRepository extends BaseRepositoryEloquent
     /**
      * Retrieve all data of repository, simple paginated.
      *
-     * @param  null|int  $limit
-     * @param  array  $columns
+     * @param null|int $limit
+     * @param array $columns
      * @return mixed
      */
-    public function cursorPaginate($current, $limit = null, $columns = ['*'])
+    public function cursorPaginate($limit = null, $columns = ['*'])
     {
         $this->applyCriteria();
         $this->applyScope();
         $limit = is_null($limit) ? config('repository.pagination.limit', 15) : (int) $limit;
 
-
         $results = $this->model->select($columns)->limit($limit)->get();
 
         if ($this->model instanceof Builder) {
@@ -46,12 +46,39 @@ abstract class BaseRepository extends BaseRepositoryEloquent
 
         $count = $results->count();
         $next = $count === $limit ? optional($results->last())->{$primaryKey} : null;
+        $this->resetModel();
+        $dataResult = $this->parserResult($results);
 
-        $prev = request('prev');
-        $this->presenter->makeCursor((int) $current, $prev ? (int) $prev : '', $next, $count);
+        $page = request('page')?:1;
+        //每页的条数
+        $perPage = $limit;
+        //计算每页分页的初始位置
+        $offset = ($page * $perPage) - $perPage;
+        //实例化Paginator类，(删掉上一步的count($video_list)参数即可 )并传入对应的参数
+        $data = new LengthAwarePaginator(array_slice($dataResult, $offset, $perPage, true), count($dataResult), $perPage, $page);
+        return $data;
+    }
 
-        $this->resetModel();
 
-        return $this->parserResult($results);
+    public function customPaginate($limit = null, $columns = ['*'])
+    {
+        $paginateResult = $this->paginate($limit,$columns);
+
+        $dataList = [];
+        // 将model对象转换城数组
+        foreach($paginateResult->items() as $data){
+            $dataList[] = $data->toArray();
+        }
+
+        $returnRecord = [];
+        $returnRecord['data'] = $dataList;
+        $returnRecord['current_page'] = $paginateResult->currentPage();
+        $returnRecord['total'] = $paginateResult->total();
+        $returnRecord['page'] = $paginateResult->currentPage() + 1;
+        if($returnRecord['page'] >= $paginateResult->lastPage()){
+           $returnRecord['page'] = $paginateResult->lastPage();
+        }
+
+        return $returnRecord;
     }
 }

server/routes/api/tools.php

@@ -24,6 +24,7 @@ $api->version('v1', function($api) {
         $api->post('/adminapi/tools/bh/getBhSordersDetail', ['permission' => 'tools.bh.order.search', 'uses'=>'BhOrdersController@getBhSordersDetail']);
         $api->get('/adminapi/tools/bh/getBhSorderRefundTask', ['permission' => 'tools.bh.order.search', 'uses'=>'BhOrdersController@getBhSorderRefundTaskToPage']);
         $api->post('/adminapi/tools/bh/execBhSorderRefundTask', ['permission' => 'tools.bh.order.search', 'uses'=>'BhOrdersController@execBhSorderRefundTask']);
+        $api->get('/adminapi/tools/bh/getSorderRefundTaskLogs', ['permission' => 'tools.bh.order.search', 'uses'=>'BhOrdersController@getSorderRefundTaskLogs']);
 
     });