From 7f331f7af2ca81bf816e38a69c6d55d92d34630f Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Thu, 22 Oct 2020 16:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AE=9E=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/HorsemanController.php               |  7 +++++--
 app/Service/v3/Implementations/HorsemanService.php     | 10 ++++++++--
 app/Service/v3/Interfaces/HorsemanServiceInterface.php |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

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);