Merge remote-tracking branch 'origin/develop' into develop

application/api/controller/Room.php

@@ -126,7 +126,7 @@ class Room extends BaseCom
                 //先转为数组 不是内侧账号 返回301
                 $inside_uid = explode(',',$inside_uid);
                 //room id = 9 是武松打鼠的房间 暂定为内侧房间
-                if(in_array($this->uid,$inside_uid) && $room_id != 9){
+                if(in_array($this->uid,$inside_uid) && ($room_id != 9 || $room_id != 37)){
                     return V(0, '不可访问');
                 }
             }

application/cron/controller/PerformPerSecond.php

@@ -352,10 +352,10 @@ class PerformPerSecond
             }
         }
         //签约到期
-        $res = Db::name('vs_room_sign')->where(['end_time' => ['>',time()],'status' => 1])->select();
+        $res = Db::name('vs_user_sign')->where(['end_time' => ['<',time()],'status' => 1])->select();
         if($res){
             foreach ($res as $value){
-                db::name('vs_room_sign')->where('id',$value['id'])->update(['status' => 2]);
+                db::name('vs_user_sign')->where('id',$value['id'])->update(['status' => 2]);
                 //处理家族
                 $myFamily = db::name('vs_family')
                     ->where(['user_id' => $value['sign_user_id'],'type' => 0,'pid' => $value['parent_user_id'],'deletetime' => 0])->find();