MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-09-22 16:47:32 +08:00
parent 86f865d163 e6f5decfca
commit f803c33f4b
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/api/controller/Room.php
View File

@@ -430,4 +430,17 @@ class Room extends BaseCom
$reslut = model('Room')->room_user_charm_list($room_id, $user_id); $reslut = model('Room')->room_user_charm_list($room_id, $user_id);
return V($reslut['code'], $reslut['msg'], $reslut['data']); return V($reslut['code'], $reslut['msg'], $reslut['data']);
} }
// //创建房间
// public function create_rooms()
// {
// //查询所有的房间信息
// $room = db::name('vs_room')->field('id,user_id')->where(['room_status' => ['<>',3]])->select();
// $i = 0;
// foreach ($room as $value) {
// $reslut = model('Tencent')->create_group($value['user_id'],'room'.$value['id']);
// $i++;
// }
// return['code' => 1, 'msg' => '成功创建了'.$i.'个房间', 'data' => null];
// }
} }

5
application/api/model/Room.php
View File

@@ -841,6 +841,7 @@ class Room extends Model
$friend = null; $friend = null;
} }
$xlh_info['xlh_info'] = model('BlindBoxTurntableGift')->get_user_xlh_info($room_id);
return ['code' => 1, return ['code' => 1,
'msg' => '成功', 'msg' => '成功',
@@ -854,6 +855,7 @@ class Room extends Model
'pk_info' => $pk_info, 'pk_info' => $pk_info,
'song_pit_list' => $song_pit_list, 'song_pit_list' => $song_pit_list,
'friend_info' => $friend, 'friend_info' => $friend,
'gift_cycle' => $xlh_info,
] ]
]; ];
} }
@@ -1988,6 +1990,8 @@ class Room extends Model
$friend = null; $friend = null;
} }
$xlh_info['xlh_info'] = model('BlindBoxTurntableGift')->get_user_xlh_info($room_id);
return ['code' => 1, return ['code' => 1,
'msg' => '成功', 'msg' => '成功',
'data' => ['room_info' => $room_info, 'data' => ['room_info' => $room_info,
@@ -2000,6 +2004,7 @@ class Room extends Model
'pk_info'=>$pk_info, 'pk_info'=>$pk_info,
'song_pit_list'=>$song_pit_list, 'song_pit_list'=>$song_pit_list,
'friend_info' => $friend, 'friend_info' => $friend,
'gift_cycle' => $xlh_info,
] ]
]; ];
} }

2
application/api/model/UserMessage.php
View File

@@ -54,6 +54,7 @@ class UserMessage extends Model
$system_no_read_count = $system_message - $user_read_message; $system_no_read_count = $system_message - $user_read_message;
$system_last_message = db::name('system_message') $system_last_message = db::name('system_message')
->field('id,type,title,content,url')
->where('type', 1)//1系统消息 3公告下的房间推荐，4公告下的活动' ->where('type', 1)//1系统消息 3公告下的房间推荐，4公告下的活动'
->where('FIND_IN_SET(:user_id, receiving_id)', ['user_id' => $uid]) ->where('FIND_IN_SET(:user_id, receiving_id)', ['user_id' => $uid])
->order('id desc') ->order('id desc')
@@ -77,6 +78,7 @@ class UserMessage extends Model
$announcement_read_count = count($system_message1) - count($user_read_message1); $announcement_read_count = count($system_message1) - count($user_read_message1);
unset($map['user_id']); unset($map['user_id']);
$announcement_last_message = db::name('system_message') $announcement_last_message = db::name('system_message')
->field('id,type,title,content,url')
->where($map) ->where($map)
->where('FIND_IN_SET(:user_id, receiving_id)', ['user_id' => $uid]) ->where('FIND_IN_SET(:user_id, receiving_id)', ['user_id' => $uid])
->order('id desc') ->order('id desc')