room_info修改

application/api/controller/Sign.php

@@ -86,6 +86,9 @@ class Sign extends BaseCom
             return V(0,  '参数错误');
         }
         $sign = db::name('vs_room_sign')->where('id', $sign_id)->field('room_id,sign_user_id')->find();
+        if($sign['sign_type'] != 1){
+            return V( 0,  '该场次签约已结束',  null);
+        }
         $user_id = $sign['sign_user_id'];
         $room_id = $sign['room_id'];
 

application/api/model/Room.php

@@ -1171,7 +1171,7 @@ class Room extends Model
                 $user_pit = db::name('vs_room_pit')->where(['room_id' => $room_id,'user_id' => $user_id])->find();
             break;
             case 10://签约房间信息
-                $room_sign = db::name('vs_room_sign')->where('room_id', $room_id)->order('id desc')->find();
+                $room_sign = db::name('vs_room_sign')->where(['room_id' => $room_id,'sign_type' => 1])->order('id desc')->find();
                 if($room_sign){
                     $sign_info = [
                         'sign_id' => $room_sign['id'],
@@ -2899,7 +2899,7 @@ class Room extends Model
 
 
     //房间信息
-    public function room_info($user_id, $room_id)
+    public function room_infos($user_id, $room_id)
     {
         if(!$room_id){
             return ['code' => 0, 'msg' => '参数错误', 'data' => null];
@@ -3180,7 +3180,7 @@ class Room extends Model
 
 
     //房间信息
-    public function room_infos($user_id, $room_id)
+    public function room_info($user_id, $room_id)
     {
         //房间基础信息先从缓存获取
         $room = json_decode(Cache::get('room_info_' . $room_id), true);
@@ -3210,8 +3210,6 @@ class Room extends Model
             return ['code' => 0, 'msg' => '当前房间类型错误，请联系管理员', 'data' => ''];
         }
 
-        //给前端定义返回的数据
-        $room_owner = null;//房间拥有者信息
         $cp_users = null;//CP用户信息
         $friend = null;//交友信息
         $singer_info = null;//点唱房内的演唱信息
@@ -3270,7 +3268,7 @@ class Room extends Model
                 $user_pit = db::name('vs_room_pit')->where(['room_id' => $room_id,'user_id' => $user_id])->find();
                 break;
             case 10://签约房间信息
-                $room_sign = db::name('vs_room_sign')->where('room_id', $room_id)->order('id desc')->find();
+                $room_sign = db::name('vs_room_sign')->where(['room_id' => $room_id,'sign_type' => 1])->order('id desc')->find();
                 if($room_sign){
                     $sign_info = [
                         'sign_id' => $room_sign['id'],

application/api/model/Sign.php

@@ -101,7 +101,7 @@ class Sign extends Model
         $data = [
             'user_id' => $user_id,
             'room_id' => $room_id,
-            'sign_time' => $sign_time,
+            'sign_time' => $sign_time,//场次 vs_room_sign 的ID
             'sign_user_id' => $sign_user_id,
             'sign_value' => $sign_value,
             'createtime' => time(),
@@ -112,14 +112,6 @@ class Sign extends Model
             return ['code' => 0, 'msg' => '网络错误，请重试！','data' => null];
         }
 
-        //记录房间流水及明细
-        //收礼记录行为日志
-//        $give_gift = model('api/GiveGift') -> change_user_give_gift_log($user_id,0,$sign_value,0,$sign_user_id,2,1,$room_id,0,3);
-//        if(!$give_gift){
-//            Db::rollback();
-//            return ['code' => 0, 'msg' => '出价失败', 'data' => null];
-//        }
-
         //增加房间火热值hot_value
         $gift_totalaa = $sign_value * get_system_config_value('coin_charm_exp');
         db::name('vs_room')->where(['id' => $room_id])->inc('hot_value', $gift_totalaa)->inc('today_hot_value', $gift_totalaa)->update();