|
@@ -937,7 +937,7 @@ class Party extends Common
|
|
|
$party_name = input('party_name'); // 派对名称
|
|
$party_name = input('party_name'); // 派对名称
|
|
|
$party_logo = input('party_logo'); // 派对logo/封面
|
|
$party_logo = input('party_logo'); // 派对logo/封面
|
|
|
$party_pass = input('party_pass'); // 派对密码
|
|
$party_pass = input('party_pass'); // 派对密码
|
|
|
- $party_type = input('party_type'); // 使用场景
|
|
|
|
|
|
|
+ //$party_type = input('party_type'); // 使用场景
|
|
|
$is_screen = input('is_screen'); // 是否关闭公屏:1=是,0=否
|
|
$is_screen = input('is_screen'); // 是否关闭公屏:1=是,0=否
|
|
|
$on_model = input('on_model'); // 上麦模式:1=自由模式,2=麦序模式
|
|
$on_model = input('on_model'); // 上麦模式:1=自由模式,2=麦序模式
|
|
|
$room_type = input('room_type',1); // 房间类型:1=派对,2=直播
|
|
$room_type = input('room_type',1); // 房间类型:1=派对,2=直播
|
|
@@ -953,7 +953,7 @@ class Party extends Common
|
|
|
$party_name && $data["party_name"] = $party_name;
|
|
$party_name && $data["party_name"] = $party_name;
|
|
|
$party_logo && $data["party_logo"] = $party_logo;
|
|
$party_logo && $data["party_logo"] = $party_logo;
|
|
|
$data["party_pass"] = $party_pass;
|
|
$data["party_pass"] = $party_pass;
|
|
|
- $party_type && $data["party_type"] = $party_type;
|
|
|
|
|
|
|
+ //$party_type && $data["party_type"] = $party_type;
|
|
|
$is_screen && $data["is_screen"] = $is_screen;
|
|
$is_screen && $data["is_screen"] = $is_screen;
|
|
|
$on_model && $data["on_model"] = $on_model;
|
|
$on_model && $data["on_model"] = $on_model;
|
|
|
$background && $data["background"] = $background;
|
|
$background && $data["background"] = $background;
|
|
@@ -962,7 +962,7 @@ class Party extends Common
|
|
|
$res = $partyModel->update($data,$where);
|
|
$res = $partyModel->update($data,$where);
|
|
|
if($res) {
|
|
if($res) {
|
|
|
// 获取派对类型
|
|
// 获取派对类型
|
|
|
- if($party_type) $data["type_name"] = \app\common\model\PartyType::where(["id"=>$party_type])->value("name");
|
|
|
|
|
|
|
+ //if($party_type) $data["type_name"] = \app\common\model\PartyType::where(["id"=>$party_type])->value("name");
|
|
|
// 存redis 房间信息
|
|
// 存redis 房间信息
|
|
|
|
|
|
|
|
$partyInfo = $this->redis->get($this->roomTypeArr[$room_type]."_".$party_id);
|
|
$partyInfo = $this->redis->get($this->roomTypeArr[$room_type]."_".$party_id);
|
|
@@ -1020,14 +1020,9 @@ class Party extends Common
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 获取用户信息
|
|
// 获取用户信息
|
|
|
- $userInfo = \app\common\model\User::field("noble,avatar,nickname,gender,level")->where(["id"=>$user_id])->find();
|
|
|
|
|
|
|
+ $userInfo = \app\common\model\User::field("avatar,nickname,gender,level")->where(["id"=>$user_id])->find();
|
|
|
if(!$userInfo) $this->error("用户信息获取失败！");
|
|
if(!$userInfo) $this->error("用户信息获取失败！");
|
|
|
// 贵族防踢。
|
|
// 贵族防踢。
|
|
|
- $nobleLevel = \app\common\model\NobleLevel::where(["id"=>$userInfo->noble])->find();
|
|
|
|
|
- if(($item == 3 || $item == 4) && $nobleLevel['fjft'] == 1) {
|
|
|
|
|
- $this->error("对方已开通".$nobleLevel['name']."贵族，踢出房间失败！");
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$data = [];
|
|
$data = [];
|
|
@@ -1182,6 +1177,7 @@ class Party extends Common
|
|
|
$userid = $this->auth->id;
|
|
$userid = $this->auth->id;
|
|
|
|
|
|
|
|
$data=unserialize($this->redis->hGet("party_lineup",$party_id));
|
|
$data=unserialize($this->redis->hGet("party_lineup",$party_id));
|
|
|
|
|
+
|
|
|
if($data && $is_empty != 1) {
|
|
if($data && $is_empty != 1) {
|
|
|
foreach($data as $k => $v) {
|
|
foreach($data as $k => $v) {
|
|
|
if($v["user_id"] == $user_id) {
|
|
if($v["user_id"] == $user_id) {
|
lizhen_gitee