From 3ee1b1f87b2bebe0cbbc000c058558a8984871ad Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Wed, 16 Sep 2020 19:26:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81banner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/GoodsController.php | 12 +++++++++++-
 app/Model/v3/GoodsBanner.php          | 24 +++++++++++++++++-------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/Controller/v3/GoodsController.php b/app/Controller/v3/GoodsController.php
index b3a8ff9..7846c01 100644
--- a/app/Controller/v3/GoodsController.php
+++ b/app/Controller/v3/GoodsController.php
@@ -54,7 +54,17 @@ class GoodsController extends BaseController
 
         //如果没有banner数据，使用商品cover图
         if(count($res['banner']) == 0){
-            $res['banner'] = [$res['detail']['cover_img']];
+            // $res['banner'] = [$res['detail']['cover_img']];
+            $res['banner'] = [[
+                'banner_url' => $res['detail']['cover_img'],
+                'goods_id' => $goodsId,
+                'type' => 1,
+                'path' => $res['detail']['cover_img'],
+                'created_at' => '',
+                'updated_at' => '',
+                'deleted_at' => '',
+                'sort' => '',
+            ]];
         }
         //如果存在用户ID则请求 购物车和收藏店铺信息
         if(isset($params['user_id'])) {
diff --git a/app/Model/v3/GoodsBanner.php b/app/Model/v3/GoodsBanner.php
index ca0fb25..3f27542 100644
--- a/app/Model/v3/GoodsBanner.php
+++ b/app/Model/v3/GoodsBanner.php
@@ -2,12 +2,20 @@
 
 namespace App\Model\v3;
 
+use App\Constants\v3\OssThumbnail;
 use App\Model\Model;
-use Hyperf\Database\Model\Builder;
+use App\Service\v3\Interfaces\AttachmentServiceInterface;
 use Hyperf\Database\Model\SoftDeletes;
+use Hyperf\Di\Annotation\Inject;
 
 class GoodsBanner extends Model
 {
+
+    /**
+     * @var AttachmentServiceInterface
+     */
+    protected $attachmentService;
+
     use SoftDeletes;
     protected $table = 'lanzu_goods_banners_new';
     
@@ -18,11 +26,13 @@ class GoodsBanner extends Model
 
     public function getBannerUrlAttribute()
     {
-        $url = $this->attributes['path'];
-        if(strripos($url,"http") === false){
-            return config('alioss.img_host').'/'.$url;
-        }else{
-            return $url;
-        }
+        // $url = $this->attributes['path'];
+        // if(strripos($url,"http") === false){
+        //     return config('alioss.img_host').'/'.$url;
+        // }else{
+        //     return $url;
+        // }
+
+        return $this->attachmentService->switchImgToAliOss($this->attributes['path'], OssThumbnail::THUMBNAIL_600_Q90);
     }
 }
\ No newline at end of file

From 49e3bc39e2e3b48b57f2fa393d7a40e6614874ed Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Wed, 16 Sep 2020 19:29:37 +0800
Subject: [PATCH 2/2] no message

---
 app/Model/v3/GoodsBanner.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Model/v3/GoodsBanner.php b/app/Model/v3/GoodsBanner.php
index 3f27542..da008a7 100644
--- a/app/Model/v3/GoodsBanner.php
+++ b/app/Model/v3/GoodsBanner.php
@@ -12,6 +12,7 @@ class GoodsBanner extends Model
 {
 
     /**
+     * @Inject
      * @var AttachmentServiceInterface
      */
     protected $attachmentService;