From 7b1e9eea5f33df1fdd8ceb27b456fe02350599db Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Mon, 7 Sep 2020 20:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5tab=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E4=BD=A0=E6=8E=A8=E8=8D=90=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v3/GoodsRecommendController.php           | 36 ++++++++++++++-----
 app/Request/v3/OrderOnlineRequest.php         |  6 ++--
 .../v3/Implementations/VerifyCodeService.php  |  2 +-
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/app/Controller/v3/GoodsRecommendController.php b/app/Controller/v3/GoodsRecommendController.php
index 79ecd34..4bd993d 100644
--- a/app/Controller/v3/GoodsRecommendController.php
+++ b/app/Controller/v3/GoodsRecommendController.php
@@ -23,16 +23,35 @@ class GoodsRecommendController extends BaseController
      */
     public function getByTabsForAppletIndex()
     {
-        $goods = Goods::query()
-            ->with(['store'])
-            ->forPage($this->request->input('page', 1), $this->request->input('pagesize', 15))
-            ->get()->toArray();
-        return $this->success(['tab_data' => $goods]);
+        $tab = $this->request->input('tab', '');
+        $page = $this->request->input('page', 1);
+        $pagesize = $this->request->input('pagesize', 10);
+
+        $builder = Goods::query()->with('store');
+
+        switch ($tab) {
+            case Tabs::APPLET_INDEX_RECOMMEND:
+                $builder = $builder->orderBy('sales', 'desc');
+                break;
+            case Tabs::APPLET_INDEX_NEW:
+                $builder = $builder->orderBy('created_at', 'desc');
+                break;
+            case Tabs::APPLET_INDEX_FRESH:
+                $builder = $builder->orderBy('price', 'asc');
+                break;
+            case Tabs::APPLET_INDEX_OFFICE:
+                $builder = $builder->whereIn('category_id', [97,98]);
+                break;
+        }
+
+        $paginate = $builder->paginate($pagesize);
+        $goods = $paginate->toArray();
+        return $this->success(['has_more_pages' => $paginate->hasMorePages(), 'tab_data' => $goods]);
 
     }
 
     /**
-     * 获取搜索页推荐商品列表
+     * 获取推荐商品列表
      * 1、前端上传标识
      * recommend_search_goods
      * recommend_search_stores
@@ -45,9 +64,10 @@ class GoodsRecommendController extends BaseController
     {
         $goods = Goods::query()
             ->with(['store'])
-            ->limit(6)
+            ->inRandomOrder()
+            ->limit(2)
             ->get()->toArray();
-        return $this->success(['tab_data' => $goods]);
+        return $this->success(['has_more_pages' => false, 'tab_data' => $goods]);
     }
 
 
diff --git a/app/Request/v3/OrderOnlineRequest.php b/app/Request/v3/OrderOnlineRequest.php
index 309364a..26859ca 100644
--- a/app/Request/v3/OrderOnlineRequest.php
+++ b/app/Request/v3/OrderOnlineRequest.php
@@ -28,9 +28,9 @@ class OrderOnlineRequest extends BaseFormRequest
             'store_list' => 'required|nonempty|json_keys:store_id,note,cart_ids',
             'delivery_time_note' => 'required|nonempty',
             'total_money' => 'required|nonempty',
-            'coupon_ids' => 'nonempty',
-            'service_money' => 'nonempty|numeric',
-            'plat' => 'nonempty',
+            'coupon_ids' => '',
+            'service_money' => 'numeric',
+            'plat' => '',
         ];
     }
 
diff --git a/app/Service/v3/Implementations/VerifyCodeService.php b/app/Service/v3/Implementations/VerifyCodeService.php
index e59846d..a700ebf 100644
--- a/app/Service/v3/Implementations/VerifyCodeService.php
+++ b/app/Service/v3/Implementations/VerifyCodeService.php
@@ -46,7 +46,7 @@ class VerifyCodeService implements VerifyCodeServiceInterface
         $expireRes = $ssdbClient->exec(
             'expire',
             SsdbKeys::VERIFY_CODE.$userId.'_'.$tel,
-            900
+            600
         );
         if (!$expireRes) {
             throw new ErrorCodeException(ErrorCode::VERIFY_CODE_ERROR);