diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php index 8e80281..2afca90 100644 --- a/application/api/model/Guild.php +++ b/application/api/model/Guild.php @@ -770,11 +770,17 @@ class Guild extends Model $room_data = []; $i=0; foreach ($list as $k=>$v){ + $add_guild_time = $v['createtime']; if(!$start_time){ - $start_time = $v['createtime']; + $start_time = $add_guild_time; $end_time = time(); - }else{ - $start_time = strtotime($start_time." 00:00:00"); + } else{ + if(strtotime($start_time) < $add_guild_time){ + $start_time = $add_guild_time; + }else{ + $start_time = strtotime($start_time); + } + $start_time = $start_time; $end_time = strtotime($end_time." 23:59:59"); } $room_info = db::name('vs_room')->where(['id'=>$v['room_id'],'room_status'=>1,'delete_time'=>0])->find();