diff --git a/application/api/model/Room.php b/application/api/model/Room.php index ce62d54..91a565b 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -2526,12 +2526,11 @@ class Room extends Model $room_id = Db::name('vs_room_visitor')->where('user_id', $user_id)->order('id desc')->value('room_id'); } $room = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->find(); - if($room){ - return ['code' => 1, 'msg' => '操作成功', 'data' => null]; - } - $room_info = db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]); - if(!$room_info){ - return ['code' => 0, 'msg' => '加入房间失败', 'data' => null]; + if(!$room){ + $room_info = db::name('vs_room_visitor')->insert(['room_id' => $room_id, 'user_id' => $user_id, 'createtime' => time()]); + if(!$room_info){ + return ['code' => 0, 'msg' => '加入房间失败', 'data' => null]; + } } return ['code' => 1, 'msg' => '操作成功', 'data' => null]; } diff --git a/application/api/model/UserData.php b/application/api/model/UserData.php index 35b1af7..f449475 100644 --- a/application/api/model/UserData.php +++ b/application/api/model/UserData.php @@ -587,6 +587,7 @@ class UserData extends Model //绑定的详情 public function bind_xinxi_detail($user_id,$type) { + $data = null; if($type == 2){ $data = db::name('user_data')->where('user_id',$user_id)->field('id,alipay_name,alipay_account')->find(); }