diff --git a/app/Controller/v3/HorsemanController.php b/app/Controller/v3/HorsemanController.php index 8212eb5..58f6c8a 100644 --- a/app/Controller/v3/HorsemanController.php +++ b/app/Controller/v3/HorsemanController.php @@ -24,8 +24,11 @@ class HorsemanController extends BaseController public function getOrderList() { - $orderMainList = $this->horsemanService->getOrderList(); - return $this->success(['order_list' => $orderMainList]); + $employeesId = $this->request->input('employees_id', -1); + $page = $this->request->input('page',0); + $pagesize = $this->request->input('pagesize',0); + $orderMainList = $this->horsemanService->getOrderList($employeesId,$page, $pagesize); + return $this->success($orderMainList); } public function getOrderInfo() diff --git a/app/Service/v3/Implementations/HorsemanService.php b/app/Service/v3/Implementations/HorsemanService.php index ff1344b..64531d7 100644 --- a/app/Service/v3/Implementations/HorsemanService.php +++ b/app/Service/v3/Implementations/HorsemanService.php @@ -27,9 +27,15 @@ class HorsemanService implements HorsemanServiceInterface { // TODO: Implement undo() method. } - public function getOrderList() + public function getOrderList($employeesId,$page=1, $pagesize=10) { - return OrderMain::query()->where('state',3)->limit(5)->get(); + $builder = OrderMain::query()->where(['state' => 3,'horseman_id' => $employeesId]); + $paginate = $builder->orderBy('created_at', 'desc')->paginate($pagesize); + $orders = $paginate->toArray(); + return [ + 'has_more_pages' => $paginate->hasMorePages(), + 'order_list' => $orders['data'] + ]; } /** diff --git a/app/Service/v3/Interfaces/HorsemanServiceInterface.php b/app/Service/v3/Interfaces/HorsemanServiceInterface.php index b080f45..9debfeb 100644 --- a/app/Service/v3/Interfaces/HorsemanServiceInterface.php +++ b/app/Service/v3/Interfaces/HorsemanServiceInterface.php @@ -9,7 +9,7 @@ interface HorsemanServiceInterface public function do(); public function check(); public function undo(); - public function getOrderList(); + public function getOrderList($employeesId,$page=1, $pagesize=10); public function setHorsemanCoordinate($horsemanId,$coordinate); public function getHorsemanCoordinate($horsemanId); public function getOrderCoordinate($globalOrderId);