|
@@ -175,20 +175,21 @@ class Party extends Api
|
|
$partyInfo["is_new"] = 1;
|
|
$partyInfo["is_new"] = 1;
|
|
|
|
|
|
// 冠名
|
|
// 冠名
|
|
- $userInfo = [];
|
|
|
|
|
|
+ /*$userInfo = [];
|
|
if($partyInfo["naming"]) {
|
|
if($partyInfo["naming"]) {
|
|
$userInfo = \app\common\model\User::field("id,nickname,avatar")->where(["id"=>$partyInfo["naming"]])->find();
|
|
$userInfo = \app\common\model\User::field("id,nickname,avatar")->where(["id"=>$partyInfo["naming"]])->find();
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
// 头像
|
|
// 头像
|
|
- if($partyInfo["user_id"] > 0 && $room_type == 2) {
|
|
|
|
|
|
+ /*if($partyInfo["user_id"] > 0 && $room_type == 2) {
|
|
$partyInfo["avatar"] = \app\common\model\User::where(["id"=>$partyInfo["user_id"]])->value("avatar");
|
|
$partyInfo["avatar"] = \app\common\model\User::where(["id"=>$partyInfo["user_id"]])->value("avatar");
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
+ $partyInfo["avatar"] = $party_logo;
|
|
// 派对类型
|
|
// 派对类型
|
|
$partyTypeName = "普通房";
|
|
$partyTypeName = "普通房";
|
|
if($partyInfo["party_type"]) {
|
|
if($partyInfo["party_type"]) {
|
|
$partyTypeName = \app\common\model\PartyType::where(["id"=>$partyInfo["party_type"]])->value("name");
|
|
$partyTypeName = \app\common\model\PartyType::where(["id"=>$partyInfo["party_type"]])->value("name");
|
|
}
|
|
}
|
|
- $partyInfo["naming"] = $userInfo;
|
|
|
|
|
|
+ $partyInfo["naming"] = [];
|
|
$partyInfo["type_name"] = $partyTypeName;
|
|
$partyInfo["type_name"] = $partyTypeName;
|
|
|
|
|
|
// 加入缓存排序,rediskey:派对热度
|
|
// 加入缓存排序,rediskey:派对热度
|
|
@@ -216,19 +217,23 @@ class Party extends Api
|
|
} else {
|
|
} else {
|
|
|
|
|
|
$partyInfo = $sqlPartyInfo;
|
|
$partyInfo = $sqlPartyInfo;
|
|
- $partyInfo["is_new"] = 0;
|
|
|
|
|
|
|
|
//初始化房间
|
|
//初始化房间
|
|
$update = [
|
|
$update = [
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
|
+ 'party_hot' => 0,
|
|
'party_logo' => $party_logo,
|
|
'party_logo' => $party_logo,
|
|
'party_name' => $party_name,
|
|
'party_name' => $party_name,
|
|
'seatnum' => $seatnum,
|
|
'seatnum' => $seatnum,
|
|
'is_public' => $is_public,
|
|
'is_public' => $is_public,
|
|
'party_notice' => '请编辑房间公告',
|
|
'party_notice' => '请编辑房间公告',
|
|
'party_notice_detail' => '请编辑房间公告内容',
|
|
'party_notice_detail' => '请编辑房间公告内容',
|
|
- 'is_recommend' => '0',
|
|
|
|
-
|
|
|
|
|
|
+ 'is_recommend' => 0,
|
|
|
|
+ 'is_close' => 0,
|
|
|
|
+ 'party_pass' => '',
|
|
|
|
+ 'is_screen' => 0,
|
|
|
|
+ 'on_model' => 1,
|
|
|
|
+ 'background' => '',
|
|
];
|
|
];
|
|
if($room_type == 1){
|
|
if($room_type == 1){
|
|
$update["platRate"] = config('site.party_party_platrate');
|
|
$update["platRate"] = config('site.party_party_platrate');
|
|
@@ -238,14 +243,12 @@ class Party extends Api
|
|
$update["guilderRate"] = config('site.party_live_guilderrate');
|
|
$update["guilderRate"] = config('site.party_live_guilderrate');
|
|
}
|
|
}
|
|
|
|
|
|
- $partyInfo = array_merge($partyInfo,$update);
|
|
|
|
-
|
|
|
|
//没有房间号的给创建一个
|
|
//没有房间号的给创建一个
|
|
if(empty($partyInfo['easemob_room_id'])){
|
|
if(empty($partyInfo['easemob_room_id'])){
|
|
$easemob_room_id = $this->easemob_createroom($party_name,$party_logo,$seatnum,$is_public,$room_type);
|
|
$easemob_room_id = $this->easemob_createroom($party_name,$party_logo,$seatnum,$is_public,$room_type);
|
|
|
|
|
|
$update['easemob_room_id'] = $easemob_room_id;
|
|
$update['easemob_room_id'] = $easemob_room_id;
|
|
- $partyInfo['easemob_room_id'] = $easemob_room_id;
|
|
|
|
|
|
+
|
|
}else{
|
|
}else{
|
|
$easemob_room_id = $partyInfo['easemob_room_id'];
|
|
$easemob_room_id = $partyInfo['easemob_room_id'];
|
|
}
|
|
}
|
|
@@ -253,22 +256,25 @@ class Party extends Api
|
|
|
|
|
|
Db::name('party')->where('id',$partyInfo['id'])->update($update);
|
|
Db::name('party')->where('id',$partyInfo['id'])->update($update);
|
|
|
|
|
|
|
|
+ $partyInfo = $partyModel->where(["id"=>$partyInfo['id']])->find();
|
|
|
|
+ $partyInfo["is_new"] = 0;
|
|
|
|
+
|
|
// 加入缓存,rediskey:派对详情
|
|
// 加入缓存,rediskey:派对详情
|
|
$this->redis->set($this->roomTypeArr[$room_type]."_".$partyInfo['id'],json_encode($partyInfo));
|
|
$this->redis->set($this->roomTypeArr[$room_type]."_".$partyInfo['id'],json_encode($partyInfo));
|
|
|
|
|
|
//[环信]初始化房间,初始化自定义属性
|
|
//[环信]初始化房间,初始化自定义属性
|
|
$matedata = [
|
|
$matedata = [
|
|
'seatnum'=> $seatnum,//麦位数量
|
|
'seatnum'=> $seatnum,//麦位数量
|
|
- 'waitsing_list' => json_encode([]),//已点歌曲列表
|
|
|
|
|
|
+ //'waitsing_list' => json_encode([]),//已点歌曲列表
|
|
'party_name' => $party_name,//房名字
|
|
'party_name' => $party_name,//房名字
|
|
'party_logo' => $party_logo,//logo
|
|
'party_logo' => $party_logo,//logo
|
|
'is_public' => $is_public,//是否公开
|
|
'is_public' => $is_public,//是否公开
|
|
'room_type' => $room_type,//房间类型
|
|
'room_type' => $room_type,//房间类型
|
|
'online_user_num' => 0,//当前房间在线的人
|
|
'online_user_num' => 0,//当前房间在线的人
|
|
- 'wealth_top3_userlist' => json_encode([]),//财富榜前3个人列表
|
|
|
|
|
|
+ //'wealth_top3_userlist' => json_encode([]),//财富榜前3个人列表
|
|
'background' => '', //房间背景
|
|
'background' => '', //房间背景
|
|
- //'party_notice' => '请编辑房间公告',
|
|
|
|
- //'party_notice_detail' => '请编辑房间公告内容',
|
|
|
|
|
|
+ 'party_notice' => $update['party_notice'],
|
|
|
|
+ 'party_notice_detail' => $update['party_notice_detail'],
|
|
];
|
|
];
|
|
$easemob = new Easemob();
|
|
$easemob = new Easemob();
|
|
$rs = $easemob->room_setRoomCustomAttributeForced($easemob_room_id,$this->auth->id,$matedata);
|
|
$rs = $easemob->room_setRoomCustomAttributeForced($easemob_room_id,$this->auth->id,$matedata);
|