From ebf8fe5cd284762444929cfbcef6107ca89ab5ec Mon Sep 17 00:00:00 2001 From: weigang Date: Wed, 30 Sep 2020 10:09:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=AD=87=E4=B8=9A=E4=B8=8D?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Constants/v3/ErrorCode.php | 2 +- app/Service/v3/Implementations/SearchService.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Constants/v3/ErrorCode.php b/app/Constants/v3/ErrorCode.php index 7c1b74b..716e2cc 100644 --- a/app/Constants/v3/ErrorCode.php +++ b/app/Constants/v3/ErrorCode.php @@ -182,7 +182,7 @@ class ErrorCode extends AbstractConstants /** * 商户异常，当前商户可能不存在或失效了 - * @Message("当前商户异常") + * @Message("当前商户可能已关店停止营业") */ const STORE_NOT_AVAILABLE = 708; diff --git a/app/Service/v3/Implementations/SearchService.php b/app/Service/v3/Implementations/SearchService.php index f605109..4768e71 100644 --- a/app/Service/v3/Implementations/SearchService.php +++ b/app/Service/v3/Implementations/SearchService.php @@ -110,7 +110,7 @@ class SearchService implements SearchServiceInterface $query->where(''.$goodsTable.'.inventory', '>', 0)->orWhere(''.$goodsTable.'.is_infinite', '=', 1); }) ->whereRaw(''.$goodsTable.'.deleted_at IS NULL') - ->where([''.$storeTable.'.market_id' => $params['market_id']]) + ->where([''.$storeTable.'.market_id' => $params['market_id'], ''.$storeTable.'.is_rest' => StoreConstants::IS_REST_NO]) /*->where('time1', '<=', date('H:i')) ->where(function ($query) { $query->where('time2', '>=', date('H:i'))