diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php index b9b3663..fe7e2a0 100644 --- a/application/api/model/Friend.php +++ b/application/api/model/Friend.php @@ -165,7 +165,7 @@ class Friend extends Model 'relation_id' => $friending_config_id, 'user_id' => $user1, 'user_id1' => $user2, - 'time_day' => get_system_config_value('friend_heart_time_day'), + 'time_day' => get_system_config_value('friend_room_timea'), 'createtime' => time(), 'status' => 1, 'type' => 1 diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index 92bfa5b..cb35c7e 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -126,6 +126,10 @@ class RoomPit extends Model if($is_pk > 0 && $pit_number == 9){ return ['code' => 0, 'msg' => '当前房间正在pk中', 'data' => null]; } + $step = db::name('vs_room')->where(['id' => $room_id, 'type_id' => 7])->value('step'); + if($step && $step != 1){ + return ['code' => 0, 'msg' => '交友房 此阶段不可操作', 'data' => null]; + } $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find(); $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标 $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标 @@ -898,6 +902,10 @@ class RoomPit extends Model } } }else{ + $step = db::name('vs_room')->where(['id' => $room_id, 'type_id' => 7])->value('step'); + if($step && $step != 1){ + return ['code' => 0, 'msg' => '交友房 此阶段不可操作', 'data' => null]; + } $where['room_id'] = $room_id; $where['pit_number'] = $pit_number; $where['user_id'] = $accept_user_id;