[需遴选到分支]当店铺休息或禁用关店时活动商品不显示

(cherry picked from commit ab512d90ea)

app/Service/v3/Implementations/ActivityService.php

@@ -46,6 +46,8 @@ class ActivityService implements ActivityServiceInterface
             })
             ->whereRaw(''.$goodsTable.'.deleted_at IS NULL')
             ->where([''.$storeTable.'.market_id' => $marketId])
+            ->where([''.$storeTable.'.is_open' => \App\Constants\v3\Store::IS_OPEN_YES])
+            ->where([''.$storeTable.'.is_rest' => \App\Constants\v3\Store::IS_REST_NO])
             ->where('time1', '<=', date('H:i'))
             ->where(function ($query) {
                 $query->where('time2', '>=', date('H:i'))