From e949a29dc6c550b4b5e5fba36e6e6b83017a77dd Mon Sep 17 00:00:00 2001 From: weigang Date: Thu, 15 Oct 2020 12:03:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E9=81=B4=E9=80=89=E5=88=B0=E5=88=86?= =?UTF-8?q?=E6=94=AF]=E5=BD=93=E5=BA=97=E9=93=BA=E4=BC=91=E6=81=AF?= =?UTF-8?q?=E6=88=96=E7=A6=81=E7=94=A8=E5=85=B3=E5=BA=97=E6=97=B6=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=95=86=E5=93=81=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit ab512d90ea1b9f1720dfc513d12fd6cca7492e4e) --- app/Service/v3/Implementations/ActivityService.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Service/v3/Implementations/ActivityService.php b/app/Service/v3/Implementations/ActivityService.php index 0a73a61..48c8cf2 100644 --- a/app/Service/v3/Implementations/ActivityService.php +++ b/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'))