|
|
@@ -175,10 +175,10 @@ class Hotel extends Api
|
|
|
|
|
|
switch ($params['status']){
|
|
|
case 1:
|
|
|
- $query->where('start_date','<',date('Y-m-d'))->where('status',1);
|
|
|
+ $query->where('start_date','>',date('Y-m-d'))->where('status',1);
|
|
|
break;
|
|
|
case 2:
|
|
|
- $query->where('start_date','>=',date('Y-m-d'))->where('status',1);
|
|
|
+ $query->where('start_date','<',date('Y-m-d'))->where('status',1);
|
|
|
break;
|
|
|
case 3:
|
|
|
$query->where('status',0);
|
|
|
@@ -190,7 +190,7 @@ class Hotel extends Api
|
|
|
$list = $query->order('id','desc')->autopage()->select();
|
|
|
foreach ($list as $key=>$val){
|
|
|
if ($val['status'] == 1){
|
|
|
- if (strtotime($val['start_date'] . '12:00:00') > time()){
|
|
|
+ if ($val['start_date'] > date('Y-m-d')){
|
|
|
$list[$key]['status_code'] = 1;
|
|
|
$list[$key]['status_txt'] = '待入住';
|
|
|
}else{
|
|
|
@@ -219,7 +219,7 @@ class Hotel extends Api
|
|
|
|
|
|
$info = $query->find();
|
|
|
if ($info['status'] == 1){
|
|
|
- if (strtotime($val['start_date'] . '12:00:00') > time()){
|
|
|
+ if ($info['start_date'] > date('Y-m-d')){
|
|
|
$info['status_code'] = 1;
|
|
|
$info['status_txt'] = '待入住';
|
|
|
}else{
|
Panda