From 7d0a735e8d4495b77efd98d7cb7d31d7223db895 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Fri, 18 Sep 2020 15:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=B2=A1=E6=9C=89=E4=B8=89=E7=BA=A7=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=97=B6=E4=B9=9F=E6=90=9C=E5=87=BA=E6=9D=A5=20=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E5=88=97=E8=A1=A8=E7=A6=81=E7=94=A8=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E5=87=BA=20=E5=88=86=E7=B1=BB=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E8=BD=AF=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/v3/GoodsCategory.php                        | 2 ++
 app/Model/v3/Market.php                               | 9 +++++++++
 app/Service/v3/Implementations/OrderOnlineService.php | 1 +
 app/Service/v3/Implementations/SearchService.php      | 5 ++++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/Model/v3/GoodsCategory.php b/app/Model/v3/GoodsCategory.php
index e60c54a..462ebbd 100644
--- a/app/Model/v3/GoodsCategory.php
+++ b/app/Model/v3/GoodsCategory.php
@@ -3,8 +3,10 @@
 namespace App\Model\v3;
 
 use App\Model\Model;
+use Hyperf\Database\Model\SoftDeletes;
 
 class GoodsCategory extends Model
 {
+    use SoftDeletes;
     protected $table = 'lanzu_goods_category';
 }
\ No newline at end of file
diff --git a/app/Model/v3/Market.php b/app/Model/v3/Market.php
index c151487..a78e15c 100644
--- a/app/Model/v3/Market.php
+++ b/app/Model/v3/Market.php
@@ -3,6 +3,7 @@
 namespace App\Model\v3;
 
 use App\Model\Model;
+use Hyperf\Database\Model\Builder;
 
 class Market extends Model
 {
@@ -14,6 +15,14 @@ class Market extends Model
         'region_name'
     ];
 
+    protected function boot(): void
+    {
+        parent::boot();
+        self::addGlobalScope('normal', function (Builder $builder) {
+            $builder->where([$this->getTable().'.status' => 1]);
+        });
+    }
+
     public function getProvinceNameAttribute()
     {
         $area = Area::query()->find($this->attributes['province_id']);
diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php
index 862cec6..3900cd8 100644
--- a/app/Service/v3/Implementations/OrderOnlineService.php
+++ b/app/Service/v3/Implementations/OrderOnlineService.php
@@ -679,6 +679,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface
             $orderMains = OrderMain::query()
                 ->where(['state' => OrderState::UNPAID])
                 ->where('created_at', '<', time()-900)
+                ->limit(100)
                 ->get();
 
             foreach ($orderMains as $key => &$orderMain) {
diff --git a/app/Service/v3/Implementations/SearchService.php b/app/Service/v3/Implementations/SearchService.php
index d726e4e..f605109 100644
--- a/app/Service/v3/Implementations/SearchService.php
+++ b/app/Service/v3/Implementations/SearchService.php
@@ -56,7 +56,10 @@ class SearchService implements SearchServiceInterface
 
         if (isset($params['goods_category_ids']) && $params['goods_category_ids']) {
             $typeIds = explode(',', $params['goods_category_ids']);
-            $builder->whereIn(''.$goodsTable.'.goods_category_id', $typeIds);
+            $builder->where(function ($query) use ($goodsTable, $typeIds) {
+                $query->whereIn(''.$goodsTable.'.goods_category_id', $typeIds)
+                    ->orWhere(''.$goodsTable.'.goods_category_id', 0);
+            });
         }
 
         if (isset($params['keyword']) && $params['keyword']) {