From 2cc608dcc9b60d33770bbe1c9fd8deb94e760b26 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Mon, 7 Sep 2020 22:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/GoodsRecommendController.php   |  2 +-
 app/Controller/v3/SearchController.php           |  4 ++--
 app/Service/v3/Implementations/SearchService.php | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/Controller/v3/GoodsRecommendController.php b/app/Controller/v3/GoodsRecommendController.php
index 74ffa30..95ee76d 100644
--- a/app/Controller/v3/GoodsRecommendController.php
+++ b/app/Controller/v3/GoodsRecommendController.php
@@ -41,7 +41,7 @@ class GoodsRecommendController extends BaseController
                 $builder = $builder->orderBy('price', 'asc');
                 break;
             case Tabs::APPLET_INDEX_OFFICE:
-                $builder = $builder->whereIn('category_id', [97,98]);
+                $builder = $builder->whereIn('category_id', [142,146]);
                 break;
         }
 
diff --git a/app/Controller/v3/SearchController.php b/app/Controller/v3/SearchController.php
index 45d9552..626ce70 100644
--- a/app/Controller/v3/SearchController.php
+++ b/app/Controller/v3/SearchController.php
@@ -51,7 +51,7 @@ class SearchController extends BaseController
         $params = $request->validated();
         $data = $this->searchService->doForGoods($params);
 
-        return $this->success(['goods' => $data]);
+        return $this->success($data);
     }
 
     /**
@@ -67,7 +67,7 @@ class SearchController extends BaseController
         $params = $request->validated();
         $data = $this->searchService->doForStores($params);
 
-        return $this->success(['stores' => $data]);
+        return $this->success($data);
     }
 
     /**
diff --git a/app/Service/v3/Implementations/SearchService.php b/app/Service/v3/Implementations/SearchService.php
index 32849fe..4ce8b47 100644
--- a/app/Service/v3/Implementations/SearchService.php
+++ b/app/Service/v3/Implementations/SearchService.php
@@ -6,6 +6,7 @@ namespace App\Service\v3\Implementations;
 
 use App\Model\v3\Goods;
 use App\Model\v3\Store;
+use Hyperf\Paginator\Paginator;
 
 class SearchService implements \App\Service\v3\Interfaces\SearchServiceInterface
 {
@@ -44,7 +45,9 @@ class SearchService implements \App\Service\v3\Interfaces\SearchServiceInterface
         }
 
         $builder->select(['id', 'store_id', 'cover_img', 'name', 'spec', 'tags', 'original_price', 'price', 'inventory', 'sales as total_sales']);
-        return $goods = $builder->forPage($params['page'], $params['pagesize'])->get()->toArray();
+        $paginate = $builder->paginate($params['pagesize']);
+        $goods = $paginate->toArray();
+        return ['has_more_pages' => $paginate->hasMorePages(), 'goods' => $goods];
     }
 
     public function doForStores($params)
@@ -81,8 +84,9 @@ class SearchService implements \App\Service\v3\Interfaces\SearchServiceInterface
         }
 
         $builder->select(['id', 'logo', 'name']);
-        $stores = $builder->forPage($params['page'], $params['pagesize'])->get()->toArray();
-        return $stores;
+        $paginate = $builder->paginate($params['pagesize']);
+        $stores = $paginate->toArray();
+        return ['has_more_pages' => $paginate->hasMorePages(), 'stores' => $stores];
     }
 
     public function getHotKeywords($type)