用户信息瘦身,歌手等级报错修改
This commit is contained in:
@@ -56,18 +56,10 @@ class RoomPit extends Model
|
||||
if(!$on){
|
||||
return ['code' => 0, 'msg' => '上麦失败', 'data' => null];
|
||||
}
|
||||
// $nickname = model('User')->where(['id' => $user_id])->value('nickname');
|
||||
$FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
|
||||
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($user_id);
|
||||
$FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
|
||||
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
|
||||
$FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($user_id,1);
|
||||
$FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $user_id,'room_id' => $room_id])->value('charm');
|
||||
$Nobility = model('api/Nobility')->getUserNobilityInfo($user_id);
|
||||
// $FromUserInfo['nobility_info'] = $Nobility;
|
||||
$FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3);
|
||||
$FromUserInfo['nobility_image'] = $Nobility['play_image'];
|
||||
$FromUserInfo['nickname_color'] = $Nobility['nick_name_color'];
|
||||
|
||||
$roomtype = db::name('vs_room')->where(['id' => $room_id])->value('type_id');
|
||||
if($roomtype == 10){
|
||||
@@ -231,14 +223,8 @@ class RoomPit extends Model
|
||||
return ['code' => 0, 'msg' => '签约麦 不可下麦', 'data' => null];
|
||||
}
|
||||
|
||||
$FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
|
||||
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
|
||||
$Nobility = model('api/Nobility')->getUserNobilityInfo($user_id);
|
||||
$FromUserInfo['nobility_info'] = $Nobility;
|
||||
$FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3);
|
||||
$FromUserInfo['nobility_image'] = $Nobility['play_image'];
|
||||
$FromUserInfo['nickname_color'] = $Nobility['nick_name_color'];
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($user_id);
|
||||
|
||||
if($pit_number == 888){
|
||||
$text['text'] = $FromUserInfo['nickname'].' 下了拍卖位 ';
|
||||
$text['type'] = 2 ;
|
||||
@@ -382,17 +368,11 @@ class RoomPit extends Model
|
||||
if(!$exchange || !$exchange1){
|
||||
return ['code' => 0, 'msg' => '换麦失败', 'data' => null];
|
||||
}
|
||||
$FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
|
||||
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($user_id);
|
||||
$FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
|
||||
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
|
||||
$FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($user_id,1);
|
||||
$FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $user_id,'room_id' => $room_id])->value('charm');
|
||||
$Nobility = model('api/Nobility')->getUserNobilityInfo($user_id);
|
||||
$FromUserInfo['nobility_info'] = $Nobility;
|
||||
$FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3);
|
||||
$FromUserInfo['nobility_image'] = $Nobility['play_image'];
|
||||
$FromUserInfo['nickname_color'] = $Nobility['nick_name_color'];
|
||||
|
||||
if($pit_number == 9){
|
||||
$pit_text = '主持麦';
|
||||
}elseif ($pit_number == 10) {
|
||||
@@ -442,11 +422,9 @@ class RoomPit extends Model
|
||||
if(!$exchange || !$exchange1){
|
||||
return ['code' => 0, 'msg' => '换麦失败', 'data' => null];
|
||||
}
|
||||
$FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
|
||||
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($user_id);
|
||||
$FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
|
||||
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
|
||||
$FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($user_id,1);
|
||||
$FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $user_id,'room_id' => $room_id])->value('charm');
|
||||
|
||||
$text['text'] = $FromUserInfo['nickname'].' 换到主持麦 ';
|
||||
@@ -745,11 +723,9 @@ class RoomPit extends Model
|
||||
continue;
|
||||
}
|
||||
//聊天室推送系统消息
|
||||
$FromUserInfo = db::name('user')->where('id',$value)->field('id as user_id,nickname,avatar,sex')->find();
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($value);
|
||||
$FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value,'room_id' => $room_id])->value('is_online');
|
||||
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($value);//魅力图标
|
||||
$FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($value,1);
|
||||
|
||||
$text['text'] = $FromUserInfo['nickname'].' 上麦了 ';
|
||||
$text['FromUserInfo'] = $FromUserInfo;
|
||||
$text['pit_number'] = 9999;
|
||||
@@ -792,11 +768,10 @@ class RoomPit extends Model
|
||||
// }
|
||||
Cache::set('auction_user_'.$room_id,$value);
|
||||
//聊天室推送系统消息
|
||||
$FromUserInfo = db::name('user')->where('id',$value)->field('id as user_id,nickname,avatar,sex')->find();
|
||||
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($value);
|
||||
$FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value,'room_id' => $room_id])->value('is_online');
|
||||
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($value);//魅力图标
|
||||
$FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($value,1);
|
||||
|
||||
$text['text'] = $FromUserInfo['nickname'].' 上了拍卖位 ';
|
||||
$text['FromUserInfo'] = $FromUserInfo;
|
||||
$text['pit_number'] = 888;
|
||||
@@ -870,16 +845,9 @@ class RoomPit extends Model
|
||||
return ['code' => 0, 'msg' => '操作失败', 'data' => null];
|
||||
}
|
||||
//制造上麦信息
|
||||
$FromUserInfo = db::name('user')->where('id',$uid)->field('id as user_id,nickname,avatar,sex')->find();
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($uid);
|
||||
$FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $uid,'room_id' => $room_id])->value('is_online');
|
||||
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($uid);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($uid);//魅力图标
|
||||
$FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($uid,1);
|
||||
$FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $uid,'room_id' => $room_id])->value('charm');
|
||||
$Nobility = model('api/Nobility')->getUserNobilityInfo($uid);
|
||||
$FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($uid,3);
|
||||
$FromUserInfo['nobility_image'] = $Nobility['play_image'];
|
||||
$FromUserInfo['nickname_color'] = $Nobility['nick_name_color'];
|
||||
//推送告诉前端上了几号麦位
|
||||
$text['text'] = $FromUserInfo['nickname'].' 上了签约麦位';
|
||||
$text['FromUserInfo'] = $FromUserInfo;
|
||||
@@ -1119,16 +1087,10 @@ class RoomPit extends Model
|
||||
return ['code' => 0, 'msg' => '操作失败', 'data' => null];
|
||||
}
|
||||
//制造上麦信息
|
||||
$FromUserInfo = db::name('user')->where('id',$accept_user_id)->field('id as user_id,nickname,avatar,sex,market_value')->find();
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($accept_user_id);
|
||||
$FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('is_online');
|
||||
$FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($accept_user_id);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($accept_user_id);//魅力图标
|
||||
$FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($accept_user_id,1);
|
||||
$FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('charm');
|
||||
$Nobility = model('api/Nobility')->getUserNobilityInfo($accept_user_id);
|
||||
$FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($accept_user_id,3);
|
||||
$FromUserInfo['nobility_image'] = $Nobility['play_image'];
|
||||
$FromUserInfo['nickname_color'] = $Nobility['nick_name_color'];
|
||||
|
||||
//推送告诉前端上了几号麦位
|
||||
if($pit_number == 1){
|
||||
$pit_text = '签约麦';
|
||||
@@ -1176,11 +1138,8 @@ class RoomPit extends Model
|
||||
if(Cache::get('auction_user_'.$room_id)){
|
||||
return ['code' => 0, 'msg' => '拍卖位上已有人,请先抱对方下麦', 'data' => null];
|
||||
}else{
|
||||
$FromUserInfo = db::name('user')->where('id',$accept_user_id)->field('id as user_id,nickname,avatar,sex')->find();
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($accept_user_id);
|
||||
$FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('is_online');
|
||||
$FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($accept_user_id);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($accept_user_id);//魅力图标
|
||||
$FromUserInfo['dress'] = model('api/Decorate')->user_decorate_detail($accept_user_id,1);
|
||||
$FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $accept_user_id])->value('charm');
|
||||
//推送告诉前端上了几号麦位
|
||||
$text['text'] = $FromUserInfo['nickname'].' 上了拍卖位 ';
|
||||
@@ -1220,11 +1179,8 @@ class RoomPit extends Model
|
||||
}
|
||||
}else{
|
||||
if($pit_number == 888){
|
||||
$FromUserInfo = db::name('user')->where('id',$accept_user_id)->field('id as user_id,nickname,avatar,sex')->find();
|
||||
$FromUserInfo = model('api/User')->get_user_base_info($accept_user_id);
|
||||
$FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('is_online');
|
||||
$FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($accept_user_id);//财富图标
|
||||
$FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($accept_user_id);//魅力图标
|
||||
$FromUserInfo['dress'] = model('api/Decorate')->user_decorate_detail($accept_user_id,1);
|
||||
$FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $accept_user_id])->value('charm');
|
||||
//推送告诉前端上了几号麦位
|
||||
$text['text'] = $FromUserInfo['nickname'].' 上了拍卖位 ';
|
||||
|
||||
Reference in New Issue
Block a user