From 2025fdf190220b5c5035cb74731e86cd032bdcb1 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Sat, 5 Sep 2020 17:43:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E3=80=81=E5=95=86=E5=AE=B6=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/CategoryService.php |  2 +-
 app/Service/v3/Implementations/SearchService.php   | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/Service/v3/Implementations/CategoryService.php b/app/Service/v3/Implementations/CategoryService.php
index e2aeda0..9738b01 100644
--- a/app/Service/v3/Implementations/CategoryService.php
+++ b/app/Service/v3/Implementations/CategoryService.php
@@ -42,7 +42,7 @@ class CategoryService implements CategoryServiceInterface
             ->groupBy(['category_id'])
             ->get()->toArray();
 
-        return GoodsType::query()
+        return Category::query()
             ->whereIn('id', array_column($goodsTypeIds, 'category_id'))
             ->orderBy('sort', 'DESC')
             ->orderBy('id', 'DESC')
diff --git a/app/Service/v3/Implementations/SearchService.php b/app/Service/v3/Implementations/SearchService.php
index dcf67ab..32849fe 100644
--- a/app/Service/v3/Implementations/SearchService.php
+++ b/app/Service/v3/Implementations/SearchService.php
@@ -44,19 +44,7 @@ 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']);
-        $goods = $builder->forPage($params['page'], $params['pagesize'])->get()->toArray();
-
-        $data = [];
-        foreach ($goods as $key => &$item) {
-            $store = (object)$item['store'];
-            unset($item['store']);
-            $data[] = [
-                'goods' => $item,
-                'store' => $store
-            ];
-        }
-
-        return $data;
+        return $goods = $builder->forPage($params['page'], $params['pagesize'])->get()->toArray();
     }
 
     public function doForStores($params)

From a74c12fe7d75c3a4a6097e0e95b9d4f6ffda5904 Mon Sep 17 00:00:00 2001
From: Mike <huangyuanzhi@baichebao.com>
Date: Sat, 5 Sep 2020 17:48:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85banner=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/GoodsController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Controller/v3/GoodsController.php b/app/Controller/v3/GoodsController.php
index dd8bdf2..280eca7 100644
--- a/app/Controller/v3/GoodsController.php
+++ b/app/Controller/v3/GoodsController.php
@@ -47,6 +47,12 @@ class GoodsController extends BaseController
             $res['detail'] = $this->goodsService->detail($params['goods_id']);
             $res['banner'] = $this->goodsService->getBanner(1572);
         }
+
+        //如果没有banner数据，使用商品cover图
+        if(count($res['banner']) == 0){
+            $res['banner'] = [$res['detail']['cover_img']];
+        }
+
         if(isset($params['user_id'])) {
             $res['shopcart']['count'] = $this->shopCartService->check(111);
             $res['shopcart']['total'] = $this->shopCartService->getTotal();

From 946b703cdcd8e387edbb7a7af31379bffd7fcbc9 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Sat, 5 Sep 2020 17:54:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/CategoryService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Service/v3/Implementations/CategoryService.php b/app/Service/v3/Implementations/CategoryService.php
index 9738b01..911c59c 100644
--- a/app/Service/v3/Implementations/CategoryService.php
+++ b/app/Service/v3/Implementations/CategoryService.php
@@ -43,7 +43,7 @@ class CategoryService implements CategoryServiceInterface
             ->get()->toArray();
 
         return Category::query()
-            ->whereIn('id', array_column($goodsTypeIds, 'category_id'))
+            ->whereIn('id', array_values(array_column($goodsTypeIds, 'category_id')))
             ->orderBy('sort', 'DESC')
             ->orderBy('id', 'DESC')
             ->get()->toArray();