Skip to content

M
my-yaf-project
Commit 9d39dd70 authored by zhz's avatar zhz
Browse files
Options

Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

parents a85e0f6d 443a5c9b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
application/models/DAO/Store.php
View file @ 9d39dd70
...@@ -178,7 +178,8 @@ class StoreModel extends \DAO\AbstractModel ...@@ -178,7 +178,8 @@ class StoreModel extends \DAO\AbstractModel
public function getOnlineStores($where = null, $field = '*', $limit = []) public function getOnlineStores($where = null, $field = '*', $limit = [])
{ {
$conditionSql = 'store_state =1 and open_flag =1 and (store_end_time >=' . TIMESTAMP . ' or store_end_time =0 ) '; //$conditionSql = 'store_state =1 and open_flag =1 and (store_end_time >=' . TIMESTAMP . ' or store_end_time =0 ) ';
$conditionSql = 'store_state =1 and open_flag =1 ';
if ($where) { if ($where) {
$conditionSql = $where . ' and ' . $conditionSql; $conditionSql = $where . ' and ' . $conditionSql;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment