|
|
@ -28,9 +28,11 @@ class SearchService implements SearchServiceInterface |
|
|
->where([ |
|
|
->where([ |
|
|
''.$storeTable.'.is_open' => StoreConstants::IS_OPEN_YES, |
|
|
''.$storeTable.'.is_open' => StoreConstants::IS_OPEN_YES, |
|
|
''.$storeTable.'.status' => StoreConstants::STATUS_PASS, |
|
|
''.$storeTable.'.status' => StoreConstants::STATUS_PASS, |
|
|
''.$storeTable.'.is_rest' => StoreConstants::IS_REST_NO |
|
|
|
|
|
]) |
|
|
|
|
|
->where([ |
|
|
|
|
|
|
|
|
]); |
|
|
|
|
|
if(!isset($params['frompage']) || $params['frompage'] != 'zh_cjdianc/pages/takeout/takeoutindex'){ |
|
|
|
|
|
$builder->where(''.$storeTable.'.is_rest',StoreConstants::IS_REST_NO); |
|
|
|
|
|
} |
|
|
|
|
|
$builder->where([ |
|
|
''.$goodsTable.'.market_id' => $params['market_id'], |
|
|
''.$goodsTable.'.market_id' => $params['market_id'], |
|
|
''.$goodsTable.'.on_sale' => GoodsConstants::ON_SALE_YES |
|
|
''.$goodsTable.'.on_sale' => GoodsConstants::ON_SALE_YES |
|
|
]) |
|
|
]) |
|
|
|