diff --git a/application/api/model/Login.php b/application/api/model/Login.php index 236c9ff2..cb110a12 100644 --- a/application/api/model/Login.php +++ b/application/api/model/Login.php @@ -193,7 +193,7 @@ class Login extends Model $save_data['system'] = $system; $save_data['login_device'] = $login_device; $save_data['logintime'] = time(); - $save_data['loginip'] = request()->server('HTTP_X_REAL_IP') ?: request()->server('HTTP_X_FORWARDED_FOR') ?: request()->ip(); + $save_data['loginip'] = $ip; $save_data['updatetime'] = time(); $save_data['prevtime'] = $user_info['logintime'];//上次登录时间 $save_data['is_online'] = 1; diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 2c2c7730..52bcb778 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -1697,8 +1697,25 @@ class Room extends Model //是否设置开播提醒 $user_info['is_open_live_remind'] = db::name('vs_user_live_remind')->where(['user_id' => $uid,'remind_user_id' => $user_id])->find() ? 1 : 0; + //用户所属工会 - $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'status'=>1,'delete_time'=>0])->value('guild_id'); + $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'delete_time'=>0,'status' => 1])->value('guild_id'); + if($guild_id){ + $user_info['guild_id'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_special_id'); + $user_info['guild_name'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_name'); + }else{ + $user_info['guild_id'] = null; + $user_info['guild_name'] = null; + } + //用户所属工会 + $me_guild_id = Db::name('vs_guild_user')->where(['user_id'=>$uid,'delete_time'=>0,'status' => 1])->value('guild_id'); + if($me_guild_id){ + $user_info['me_guild_id'] = db::name('vs_guild')->where(['id'=>$me_guild_id])->value('guild_special_id'); + $user_info['me_guild_name'] = db::name('vs_guild')->where(['id'=>$me_guild_id])->value('guild_name'); + }else{ + $user_info['me_guild_id'] = null; + $user_info['me_guild_name'] = null; + } $user_info['is_mute'] = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 1])->find() ? 1 : 0; $user_info['is_mute_pit'] = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 2])->find() ? 1 : 0; @@ -1708,28 +1725,10 @@ class Room extends Model $user_info['is_follow'] = db::name('user_follow')->where(['user_id' => $uid, 'follow_id' => $user_id,'type' => 1])->find() ? 1 : 0; //近90天内收到的礼物数量 $user_info['gift_num'] = db::name('vs_give_gift')->where(['gift_user' => $user_id])->whereTime('createtime', '>', strtotime('-90 day'))->sum('number')?? 0; - if($guild_id){ - $guild = Db::name('vs_guild')->where('id' ,$guild_id)->value('guild_name'); - }else{ - $guild = ''; - } - $qinmi = null; - $zhenai = null; -// $guanxi = $this->relation_card($uid,$user_id); -// if($guanxi['code'] == 1){ -// $qinmi_arr = $guanxi['data']['qinmi']; -// if(!empty($qinmi_arr)){ -// $qinmi = $qinmi_arr[0]; -// } -// $zhenai_arr = $guanxi['data']['zhenai']; -// if(!empty($zhenai_arr)){ -// $zhenai = $zhenai_arr[0]; -// } -// } - $user_info['qinmi'] = $qinmi; - $user_info['zhenai'] = $zhenai; - $user_info['guild'] = $guild; + $user_info['qinmi'] = null; + $user_info['zhenai'] = null; + $Nobility = model('Nobility')->getUserNobilityInfo($user_id);//nobility_image $user_info['nobility_image'] = $Nobility['play_image']; $user_info['nickname_color'] = $Nobility['nick_name_color']; @@ -1952,6 +1951,24 @@ class Room extends Model //开启事务 db::startTrans(); + + //在麦位上的用户 全部下麦 + $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id,'user_id' => ['>',0],'pit_number' => ['<>',9]])->select(); + if($on_pit){ + foreach ($on_pit as $v){ + model('RoomPit')->DownPit($v['user_id'], $room_id,$v['pit_number']); + } + } + + //转到type= 10 签约房 嘉宾麦有人也下麦 + if($type == 10){ + $jiabin = db::name('vs_room_pit')->where(['room_id' => $room_id,'pit_number' => 10])->value('user_id'); + if($jiabin){ + model('RoomPit')->DownPit($jiabin, $room_id,10); + } + } + + $data = []; //1-交友，3、4、8-不要了 if($type == 1 || $type == 3 || $type == 4 || $type == 8){ @@ -2002,6 +2019,7 @@ class Room extends Model db::rollback(); return ['code' => 0, 'msg' => '修改失败', 'data' => null]; } + //如果房间正在点唱中，结束点唱 $romm_song = db::name('vs_room_song')->where(['room_id' => $room_id])->order('did desc')->find(); if(isset($romm_song) && ($romm_song['status'] == 1 || $romm_song['status'] == 2)){ @@ -2010,20 +2028,6 @@ class Room extends Model db::name('vs_room_song')->where('room_id',$room_id)->update(['times_status'=>2]); } } - //在麦位上的用户 全部下麦 - $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id,'status' => 1,'user_id'=>['>',0],'pit_number' => ['<',9]])->select(); - if($on_pit){ - foreach ($on_pit as $v){ - model('RoomPit')->DownPit($v['user_id'], $room_id,$v['pit_number']); - } - } - //转到type= 10 签约房 嘉宾麦有人也下麦 - if($type == 10){ - $jiabin = db::name('vs_room_pit')->where(['room_id' => $room_id,'pit_number' => 10])->value('user_id'); - if($jiabin){ - model('RoomPit')->DownPit($jiabin, $room_id,10); - } - } db::name('vs_room_pit_simulate')->where(['room_id' => $room_id])->delete(); //申请上麦的全部下麦 @@ -2062,15 +2066,7 @@ class Room extends Model 'text' => '房间类型已修改type--'.$type ]; model('Chat')->sendMsg(1012,$room_id,$text); - //查询房间里面的用户 - $room_user = db::name('vs_room_visitor')->where(['room_id' => $room_id])->select(); - if($room_user){ - foreach ($room_user as $v){ - if(Db::name('user')->where('id', $v['user_id'])->value('is_online') == 0){ -// model('Room')->quit_room($v['user_id'], $room_id,$v['user_id'],2); - } - } - } + return ['code' => 1, 'msg' => '修改成功', 'data' => null]; } diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index 6a1ec7e7..ab2e8a54 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -161,6 +161,8 @@ class RoomPit extends Model return ['code' => 0, 'msg' => '拍卖中不能能下麦', 'data' => null]; } $pit_number = 888; + }else{ + $pit_number = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->value('pit_number'); } }else{ if(!$pit_number){ diff --git a/application/api/model/Sign.php b/application/api/model/Sign.php index 057d3cf2..39760be3 100644 --- a/application/api/model/Sign.php +++ b/application/api/model/Sign.php @@ -293,20 +293,21 @@ class Sign extends Model db::rollback(); return ['code' => 0, 'msg' => '网络错误，请重试', 'data' => null]; } - }elseif ($sign_user_type == 1){ + }elseif ($sign_user_type == 1) { //签过 给被签约的人分七天给他 // 数据插入 循环插入7条数据 day 取值是今天开始连续七天 的每一天的值 到天 - for ($i = 0; $i < 7; $i++){ + + for ($i = 0; $i < 7; $i++) { $data1 = [ 'user_id' => $max_sign_user['sign_user_id'], - 'value' => round($shouyizs/7, 4), + 'value' => round($shouyizs / 7, 4), 'day' => date('Y-m-d', strtotime("+$i days")), // 从今天开始连续七天的日期 - 'times' => $i+1, + 'times' => $i + 1, 'createtime' => time() ]; // 插入数据库 - $result[$i] = db::name('vs_user_sign_task')->insert($data1); - if(!$result[$i]){ + $result = db::name('vs_user_sign_task')->insert($data1); + if (!$result) { db::rollback(); return ['code' => 0, 'msg' => '网络错误，请重试', 'data' => null]; } diff --git a/application/api/model/User.php b/application/api/model/User.php index 63f64c9c..3968e94a 100644 --- a/application/api/model/User.php +++ b/application/api/model/User.php @@ -215,6 +215,17 @@ class User extends Model $user_info['market_value_coin'] = $coin_market_value[0]; $user_info['market_value_market'] = $coin_market_value[1]; + //用户所属工会 + $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$uid,'delete_time'=>0,'status' => 1])->value('guild_id'); + if($guild_id){ + $user_info['guild_id'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_special_id'); + $user_info['guild_name'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_name'); + }else{ + $user_info['guild_id'] = null; + $user_info['guild_name'] = null; + } + + return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info]; } @@ -407,9 +418,11 @@ class User extends Model //用户所属工会 $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$uid,'status'=>1,'delete_time'=>0])->value('guild_id'); if($guild_id){ - $user_info['guild'] = Db::name('vs_guild')->where('id' ,$guild_id)->value('guild_name'); + $user_info['guild_id'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_special_id'); + $user_info['guild_name'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_name'); }else{ - $user_info['guild'] = ''; + $user_info['guild_id'] = null; + $user_info['guild_name'] = null; } $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image $user_info['nobility_image'] = $Nobility['play_image']; diff --git a/application/common/controller/BaseCom.php b/application/common/controller/BaseCom.php index b919ba55..d77c3dce 100644 --- a/application/common/controller/BaseCom.php +++ b/application/common/controller/BaseCom.php @@ -21,9 +21,9 @@ class BaseCom extends Controller //检测系统是否维护中 $is_maintenance = get_system_config_value('is_maintenance'); - if($is_maintenance == 2){ - return V(0, '系统维护中'); - } + + //获取内侧账号 + $inside_uid = get_system_config_value('inside_uid'); //检测是什么系统 $system = input('system',''); if(empty($system)){ @@ -60,6 +60,16 @@ class BaseCom extends Controller $this->uid = $reslut['data']; //定义一个常量 define('UID', $this->uid); + //检测ID是否在内测中 $inside_uid 是逗号分隔的ID $is_maintenance ==3 是内测 + if($inside_uid && $is_maintenance == 3){ + //先转为数组 不是内侧账号 返回301 + $inside_uid = explode(',',$inside_uid); + if(!in_array($this->uid,$inside_uid)){ + return V(0, '系统维护中'); + } + }elseif($is_maintenance == 2){ + return V(0, '系统维护中'); + } } } @@ -80,6 +90,16 @@ class BaseCom extends Controller $this->uid = $reslut['data']; //定义一个常量 define('UID', $this->uid); + //检测ID是否在内测中 $inside_uid 是逗号分隔的ID $is_maintenance ==3 是内测 + if($inside_uid && $is_maintenance == 3){ + //先转为数组 不是内侧账号 返回301 + $inside_uid = explode(',',$inside_uid); + if(!in_array($this->uid,$inside_uid)){ + return V(0, '系统维护中'); + } + }elseif($is_maintenance == 2){ + return V(0, '系统维护中'); + } } } } diff --git a/application/cron/controller/PerformPerSecond.php b/application/cron/controller/PerformPerSecond.php index b0cec534..8a7d0a54 100644 --- a/application/cron/controller/PerformPerSecond.php +++ b/application/cron/controller/PerformPerSecond.php @@ -352,16 +352,17 @@ class PerformPerSecond } } //签约到期 - $res1 = Db::name('vs_user_sign')->where(['end_time' => ['<=',time()]])->select(); - if($res1){ - foreach ($res1 as $v){ - //查找家族 + $res = Db::name('vs_room_sign')->where(['end_time' => ['>',time()],'status' => 1])->select(); + if($res){ + foreach ($res as $value){ + db::name('vs_room_sign')->where('id',$value['id'])->update(['status' => 2]); + //处理家族 $myFamily = db::name('vs_family') - ->where(['user_id' => $v['sign_user_id'],'type' => 0,'pid' => $v['parent_user_id'],'deletetime' => 0])->find(); + ->where(['user_id' => $value['sign_user_id'],'type' => 0,'pid' => $value['parent_user_id'],'deletetime' => 0])->find(); if($myFamily){ - $mySignFamily = db::name('vs_family')->where(['user_id' => $v['parent_user_id'],'type' => 1])->find(); + $mySignFamily = db::name('vs_family')->where(['user_id' => $value['parent_user_id'],'type' => 1])->find(); //删除群成员 - model('api/Tencent')->delete_group_member('f'.$mySignFamily['id'], $v['sign_user_id']); + model('api/Tencent')->delete_group_member('f'.$mySignFamily['id'], $value['sign_user_id']); //退出家族 db::name('vs_family')->where('id', $myFamily['id'])->update(['deletetime' => time()]); }