diff --git a/application/api/model/Room.php b/application/api/model/Room.php index aa04cdd3..985f7164 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -1207,6 +1207,10 @@ class Room extends Model 'updatetime' => time() ]); } + $tet['text'] = '回到房间'; + $tet['user_id'] = $user_id; + $tet['type'] = 1; + model('api/Chat')->sendMsg(1058,$room_id,$tet); //头条 $headline = db::name('vs_headline')->where('end_time' , '>', time())->where('is_now', 1)->find(); diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php index cc9f53bb..5990de19 100644 --- a/application/api/model/SingerSong.php +++ b/application/api/model/SingerSong.php @@ -75,10 +75,10 @@ class SingerSong extends Model return ['code' => 0, 'msg' => '请先认证歌手', 'data' => null]; } //查询是否提交过歌曲 - $res = db::name('vs_singer_song')->where(['user_id' => $user_id, 'song_name' => $song_name])->find(); - if ($res) { - return ['code' => 0, 'msg' => '请勿重复提交歌曲', 'data' => null]; - } +// $res = db::name('vs_singer_song')->where(['user_id' => $user_id, 'song_name' => $song_name ,'deletetime' => 0])->find(); +// if ($res) { +// return ['code' => 0, 'msg' => '请勿重复提交歌曲', 'data' => null]; +// } //礼物不能是CP礼物 $cp_gift_ids = explode(',', get_system_config_value('cp_gift_id'));