|
@@ -62,19 +62,19 @@ Class Manage
|
|
$where['start'] = strtotime($start);
|
|
$where['start'] = strtotime($start);
|
|
}
|
|
}
|
|
if ($end) {
|
|
if ($end) {
|
|
- $where['end'] = strtotime($end);
|
|
|
|
|
|
+ $where['end'] = strtotime($end)+86399;
|
|
}
|
|
}
|
|
if ($fastart) {
|
|
if ($fastart) {
|
|
$where['fastart'] = strtotime($fastart);
|
|
$where['fastart'] = strtotime($fastart);
|
|
}
|
|
}
|
|
if ($faend) {
|
|
if ($faend) {
|
|
- $where['faend'] = strtotime($faend);
|
|
|
|
|
|
+ $where['faend'] = strtotime($faend)+86399;
|
|
}
|
|
}
|
|
if ($fstart) {
|
|
if ($fstart) {
|
|
$where['fstart'] = strtotime($fstart);
|
|
$where['fstart'] = strtotime($fstart);
|
|
}
|
|
}
|
|
if ($fend) {
|
|
if ($fend) {
|
|
- $where['fend'] = strtotime($fend);
|
|
|
|
|
|
+ $where['fend'] = strtotime($fend)+86399;
|
|
}
|
|
}
|
|
if ($cate && $cate>0) {
|
|
if ($cate && $cate>0) {
|
|
$where['shop_type'] = $cate;
|
|
$where['shop_type'] = $cate;
|
|
@@ -83,7 +83,7 @@ Class Manage
|
|
$where['name'] = $name;
|
|
$where['name'] = $name;
|
|
}
|
|
}
|
|
if ($shop_name) {
|
|
if ($shop_name) {
|
|
- $shop = Dever::db('shop/info')->find(array('name'=>$name));
|
|
|
|
|
|
+ $shop = Dever::db('shop/info')->find(array('name'=>$shop_name));
|
|
if ($shop) {
|
|
if ($shop) {
|
|
$where['shop_id'] = $shop['id'];
|
|
$where['shop_id'] = $shop['id'];
|
|
}
|
|
}
|
|
@@ -509,19 +509,19 @@ Class Manage
|
|
$where['start'] = strtotime($start);
|
|
$where['start'] = strtotime($start);
|
|
}
|
|
}
|
|
if ($end) {
|
|
if ($end) {
|
|
- $where['end'] = strtotime($end);
|
|
|
|
|
|
+ $where['end'] = strtotime($end)+86399;
|
|
}
|
|
}
|
|
if ($fastart) {
|
|
if ($fastart) {
|
|
$where['fastart'] = strtotime($fastart);
|
|
$where['fastart'] = strtotime($fastart);
|
|
}
|
|
}
|
|
if ($faend) {
|
|
if ($faend) {
|
|
- $where['faend'] = strtotime($faend);
|
|
|
|
|
|
+ $where['faend'] = strtotime($faend)+86399;
|
|
}
|
|
}
|
|
if ($fstart) {
|
|
if ($fstart) {
|
|
$where['fstart'] = strtotime($fstart);
|
|
$where['fstart'] = strtotime($fstart);
|
|
}
|
|
}
|
|
if ($fend) {
|
|
if ($fend) {
|
|
- $where['fend'] = strtotime($fend);
|
|
|
|
|
|
+ $where['fend'] = strtotime($fend)+86399;
|
|
}
|
|
}
|
|
if ($parent_type && $parent_type>0) {
|
|
if ($parent_type && $parent_type>0) {
|
|
$where['parent_type'] = $parent_type;
|
|
$where['parent_type'] = $parent_type;
|
|
@@ -715,13 +715,13 @@ Class Manage
|
|
$where['cstart'] = 't_1.cdate+(360*86400)>='. strtotime($cstart);
|
|
$where['cstart'] = 't_1.cdate+(360*86400)>='. strtotime($cstart);
|
|
}
|
|
}
|
|
if ($cend) {
|
|
if ($cend) {
|
|
- $where['cend'] = 't_1.cdate+(360*86400)<='.strtotime($cend);
|
|
|
|
|
|
+ $where['cend'] = 't_1.cdate+(360*86400)<='.strtotime($cend)+86399;
|
|
}
|
|
}
|
|
if ($start) {
|
|
if ($start) {
|
|
$where['start'] = 't_1.cdate>='.strtotime($start);
|
|
$where['start'] = 't_1.cdate>='.strtotime($start);
|
|
}
|
|
}
|
|
if ($end) {
|
|
if ($end) {
|
|
- $where['end'] = 't_1.cdate<='.strtotime($end);
|
|
|
|
|
|
+ $where['end'] = 't_1.cdate<='.strtotime($end)+86399;
|
|
}
|
|
}
|
|
|
|
|
|
if ($member_name) {
|
|
if ($member_name) {
|
|
@@ -734,7 +734,7 @@ Class Manage
|
|
$where['rstart'] = 't_2.cdate>='.strtotime($rstart);
|
|
$where['rstart'] = 't_2.cdate>='.strtotime($rstart);
|
|
}
|
|
}
|
|
if ($rend) {
|
|
if ($rend) {
|
|
- $where['rend'] = 't_2.cdate<='.strtotime($rend);
|
|
|
|
|
|
+ $where['rend'] = 't_2.cdate<='.strtotime($rend)+86399;
|
|
}
|
|
}
|
|
$where['t_1.state'] = 't_1.state=1';
|
|
$where['t_1.state'] = 't_1.state=1';
|
|
$where['t_1.type'] = "t_1.type in (1,2)";
|
|
$where['t_1.type'] = "t_1.type in (1,2)";
|
|
@@ -861,7 +861,7 @@ Class Manage
|
|
$where['start'] = strtotime($start);
|
|
$where['start'] = strtotime($start);
|
|
}
|
|
}
|
|
if ($end) {
|
|
if ($end) {
|
|
- $where['end'] = strtotime($end);
|
|
|
|
|
|
+ $where['end'] = strtotime($end)+86399;
|
|
}
|
|
}
|
|
if ($type) {
|
|
if ($type) {
|
|
$where['types'] = $type;
|
|
$where['types'] = $type;
|