商品搜索分类没有三级分类时也搜出来

市场列表禁用市场不展出
分类使用软删除

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';
 }

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']);

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) {

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']) {