关系

application/adminapi/controller/Activities.php

@@ -683,6 +683,8 @@ class Activities extends adminApi
         }
         if($gift_bag_id){
             $where['a.gift_bag_id'] = $gift_bag_id;
+        }else{
+            $where['a.gift_bag_id'] = ['in', [1,2]];
         }
         if($begin_time){
             $where['a.createtime'] = ['>=', strtotime($begin_time)];

application/adminapi/controller/BlindBox.php

@@ -188,9 +188,9 @@ class BlindBox extends adminApi
         if($type){
             $where['type'] = $type;
         }
-        if($label){
-            $where['label'] = $label;
-        }
+//        if($label){
+//            $where['label'] = $label;
+//        }
         $list = db::name("vs_gift")->where($where)->order('sort','asc')->select();
         $list_data = [];
         foreach ($list as $k=>$v){
@@ -537,7 +537,7 @@ class BlindBox extends adminApi
         if($activities_id == ""){
             $activities_id = 4;
         }
-        $bag_list = db::name("vs_gift_bag")->field('id,name')->where(['activities_id'=>$activities_id,'status'=>1])->select();
+        $bag_list = db::name("vs_gift_bag")->field('id,name')->where(['activities_id'=>$activities_id])->select();
         return V(1,"成功", $bag_list);
     }
     //--------------------------盲盒转盘与巡乐会-------------------------------------------------------

application/adminapi/controller/Nobility.php

@@ -426,7 +426,7 @@ class Nobility extends adminApi
         if (empty($lid)) {
             return V(0, "请选择爵位");
         }
-        $reslut = model('api/Nobility')->buyNobility($user_id,$lid);
+        $reslut = model('api/Nobility')->buyNobility($user_id,$lid,1);
         return  V($reslut['code'],$reslut['msg'], null);
     }
 }

application/adminapi/controller/Room.php

@@ -343,7 +343,12 @@ class Room extends adminApi
         $count = db::name($this->relation)->where($where)->count();
         $lists = db::name($this->relation)->where($where)->page($page, $page_limit)->select();
         foreach ($lists as $key => $value) {
-            $lists[$key]['type_str'] = model('Room')->relation_type[$value['type']];
+            if($value['type'] > 0){
+                $lists[$key]['type_str'] = model('Room')->relation_type[$value['type']];
+            }else{
+                $lists[$key]['type_str'] = '无关系';
+            }
+
             $lists[$key]['is_open_movie'] = $value['is_open_movie']==1?'是':'否';
             $lists[$key]['createtime'] = date('Y-m-d H:i:s', $value['createtime']);
         }

application/adminapi/controller/SysSet.php

@@ -25,16 +25,18 @@ class SysSet extends adminApi
 
     public $configType = [
         '1' => '基础设置',
-        '2' => '登录设置',
+//        '2' => '登录设置',
         '3' => '支付配置',
         '4' => '提现设置',
-        '5' => '推送及IM配置',
+//        '5' => '推送及IM配置',
 //        '6' => '每日任务设置',
-        '7' => '云存储配置',
+        '7' => '第三方配置',
         '8' => '房间配置',
-        '9' => '弹窗内容设置',
+//        '9' => '弹窗内容设置',
         '10' => '邀请奖励',
         '11' => '二级密码',
+        '12' => '情侣任务设置',
+        '13' => '趣味活动中',
     ];
     public $noAdminConfigType = [
         '1' => '基础设置',

application/adminapi/controller/User.php

@@ -146,6 +146,8 @@ class User extends adminApi
             $lists[$key]['user_block_time'] = '';
             $lists[$key]['mobile_block_time'] = '';
             $lists[$key]['ip_block_time'] = '';
+            //禁用理由
+            $lists[$key]['user_block_reason'] = '';
             if($is_block_user){
                 $lists[$key]['is_block_user'] = 1;
                 if($is_block_user['block_time']==0){
@@ -153,6 +155,7 @@ class User extends adminApi
                 }else{
                     $lists[$key]['user_block_time'] = date('Y-m-d H:i:s',$is_block_user['block_time']);
                 }
+                $lists[$key]['user_block_reason'] = model('Block')->getBanReason()[$is_block_user['ban_eason']];
             }
 //            if($is_block_mobile){
 //                $lists[$key]['is_block_mobile'] = 1;

application/adminapi/model/Monster.php

@@ -33,7 +33,8 @@ class Monster extends Model
     public function get_gift_list(){
         $map = [];
         // $map[] = ['gid', 'not in', [36,37,38]];
-        $map['type'] = ['=', 1];
+        $map['type'] = ['=', 2];
+        // $map['label'] = ['=', 18];
         $map['is_show'] = ['=',1];
         $map['delete_time'] = ['=', 0];
         $list = db::name('vs_gift')->where($map)->order('gift_price asc')->select();

application/api/controller/Nobility.php

@@ -39,7 +39,7 @@ class Nobility extends BaseCom
     public function buy_nobility(){
         $lid = input('lid', 0);
         $uid = input('uid', $this->uid);
-        $reslut = model('Nobility')->buyNobility($uid,$lid);
+        $reslut = model('Nobility')->buyNobility($uid,$lid,$is_send);
         return  V($reslut['code'],$reslut['msg'], null);
     }
 }

application/api/controller/Xintiao.php

@@ -31,7 +31,7 @@ class Xintiao extends BaseCom
             ]);
         }
         //查询房间是否热门房间
-        $is_hot_room = db::name('vs_room')->where(['id' => $room_id,'is_hot' => 1])->find();
+        $is_hot_room = db::name('vs_room')->where(['id' => $room_id,'is_hot' => 2])->find();
         if($is_hot_room){
             //任务：18-每日在线时长 5 分钟
             model('Tasks')->tasks_complete($user_id,18);

application/api/model/BlindBoxTurntableGift.php

@@ -23,18 +23,18 @@ class BlindBoxTurntableGift extends Model
     public function get_gift_list($gift_bag_id,$room_id)
     {
         $box = db::name('vs_gift_bag')->where('id',$gift_bag_id)->find();
-        $gifts = db::name('vs_gift_bag_detail')->where('gift_bag_id',$gift_bag_id)->order("id desc")->select();
+        $gifts = db::name('vs_gift_bag_detail')->alias('a')
+            ->field('a.*,aa.gid,aa.gift_name,aa.base_image,aa.play_image,aa.gift_price')
+            ->join('vs_gift aa','a.foreign_id = aa.gid')
+            ->where('gift_bag_id',$gift_bag_id)->order("gift_price desc")->select();
         $gift_list = [];
         foreach ($gifts as $key => $value) {
-            $gift_data = db::name('vs_gift')->where('gid',$value['foreign_id'])->where('delete_time',0)->find();
-            if($gift_data){
-                $gift_list[$key]['number'] = $key;
-                $gift_list[$key]['gift_id'] = $gift_data['gid'];
-                $gift_list[$key]['gift_name'] = $gift_data['gift_name'];
-                $gift_list[$key]['base_image'] = $gift_data['base_image'];
-                $gift_list[$key]['play_image'] = $gift_data['play_image'];
-                $gift_list[$key]['gift_price'] = $gift_data['gift_price'];
-            }
+            $gift_list[$key]['number'] = $key;
+            $gift_list[$key]['gift_id'] = $value['gid'];
+            $gift_list[$key]['gift_name'] = $value['gift_name'];
+            $gift_list[$key]['base_image'] = $value['base_image'];
+            $gift_list[$key]['play_image'] = $value['play_image'];
+            $gift_list[$key]['gift_price'] = $value['gift_price'];
         }
         $ext = json_decode($box['ext'],true);
         $box_gift = Db::name('vs_gift')->where('gid',$ext['gift_id'])->find();
@@ -474,7 +474,16 @@ class BlindBoxTurntableGift extends Model
         }
         //用户充值金额
         $user_recharge_money = db::name('vs_user_recharge')->where(['user_id'=>$user_id,'pay_status'=>2])->sum('money');
-        if($user_recharge_money < $fun_activities_recharge_restrictions){
+        //内测用户
+        //先从cache中获取
+        $inside_uid = Cache::get('inside_uid');
+        if(!$inside_uid){
+            $inside_uid = get_system_config_value('inside_uid');
+            //缓存 并设置缓存时间
+            Cache::set('inside_uid',$inside_uid,3600);
+        }
+        $inside_uid = explode(',',$inside_uid);
+        if(($user_recharge_money < $fun_activities_recharge_restrictions) && !in_array($user_id,$inside_uid)){
             return ['code' => 0, 'msg' => '充值金额不足', 'data' => null];
         }
         foreach ($gift_bag as $bag){

application/api/model/Decorate.php

@@ -647,6 +647,24 @@ class Decorate extends Model
                     'end_time' => date('Y-m-d H:00:00', time()),
                     'createtime' => time()
                 ]);
+                //推送消息
+                $FromUserInfo = db::name('user')->where(['id' => $uid])->find();
+                $text1 = $FromUserInfo['nickname'] . ' 在本房间使用了房间热度卡 提升房间'.$increase_hot_value.'热度';
+                $text = [
+                    'FromUserInfo' => $FromUserInfo,
+                    'ToUserInfo' => null,
+                    'GiftInfo' => [
+                        'gift_id' => 0,
+                        'gift_name' => '房间热度卡',
+                        'gift_icon' => "",
+                        'play_image' => "",
+                        'base_image' => db::name('vs_decorate')->where(['did' => $info['did']])->value('base_image'),
+                    ],
+                    'gift_num' => $num,
+                    'text' => $text1
+                ];
+                //聊天室推送系统消息
+                model('Chat')->sendMsg(1005,$room_id,$text);
             }else{
                 $map = [
                     'user_id' => $uid,
@@ -688,6 +706,24 @@ class Decorate extends Model
                     'end_time' => date('Y-m-d H:00:00', time()),
                     'createtime' => time()
                 ]);
+                //推送消息
+                $FromUserInfo = db::name('user')->where(['id' => $uid])->find();
+                $text1 = $FromUserInfo['nickname'] . ' 在本房间使用了房间热度卡 提升房间'.$increase_hot_value_all.'热度';
+                $text = [
+                    'FromUserInfo' => $FromUserInfo,
+                    'ToUserInfo' => null,
+                    'GiftInfo' => [
+                        'gift_id' => 0,
+                        'gift_name' => '房间热度卡',
+                        'gift_icon' => "",
+                        'play_image' => "",
+                        'base_image' => db::name('vs_decorate')->where(['did' => $info['did']])->value('base_image'),
+                    ],
+                    'gift_num' => $num,
+                    'text' => $text1
+                ];
+                //聊天室推送系统消息
+                model('Chat')->sendMsg(1005,$room_id,$text);
             }
             // 提交事务
             Db::commit();

application/api/model/Gift.php

@@ -135,8 +135,11 @@ class Gift extends Model
                     }
                 }
                 //爆币
-                $pool_gift_id = db::name('bb_lottery_config')->where(['key' => 'pool_gift_id'])->value('value');
-                if($pool_gift_id == $v['gift_id']){
+                $pool_gift_id_arr[] = db::name('bb_lottery_config')->where(['key' => 'pool_gift_id'])->value('value');
+                $pool_gift_id_arr[] = db::name('bb_lottery_config')->where(['key' => 'pool_gift_id_5'])->value('value');
+                $pool_gift_id_arr[] = db::name('bb_lottery_config')->where(['key' => 'pool_gift_id_10'])->value('value');
+
+                if(in_array($v['gift_id'],$pool_gift_id_arr)){
                     $v['gift_bag_name'] = "幸运币活动";
                     $v['rule'] = "幸运羽币";
                     $v['rule_url'] = get_system_config_value('web_site')."/api/Page/page_show?id=35";

application/api/model/Monster.php

@@ -242,48 +242,51 @@ class Monster extends Model
                 $push_feed_monster_data['num'] = 0;
                 $push_feed_monster_data['total_gift_price'] = 0;
                 $push_feed_monster_data['is_push_message'] = 2;
+                $push_feed_monster_data['base_image'] = localpath_to_netpath($win_gift_info['base_image']);
 
-                if(!empty($part_user_array)){
-                    foreach ($part_user_array as $k => $v){
-                        $push_user_monster_data = [];
-                        $push_user_monster_data['win_type'] = $win_type;
-                        $push_user_monster_data['type_name'] = db::name('monster')->where('type', $win_type)->value('type_name');
-                        //是否中奖
-                        $map = [];
-                        $map['mid'] = $monster_log['id'];
-                        $map['uid'] = $v;
-                        $user_win_info = db::name('user_monster_win_log')->where($map)->find();
-                        if($user_win_info){//中奖
-                            $push_user_monster_data['is_win'] = 1;
-                            $push_user_monster_data['gid'] = $win_gift_info['gid'];
-                            $push_user_monster_data['gift_name'] = $win_gift_info['gift_name'];
-                            $push_user_monster_data['base_image'] = localpath_to_netpath($win_gift_info['base_image']);
-                            $push_user_monster_data['gift_price'] = $win_gift_info['gift_price'];
-                            $push_user_monster_data['num'] = $user_win_info['num'];
-                            $push_user_monster_data['total_gift_price'] = $win_gift_info['gift_price'] * $user_win_info['num'];
-                            $push_feed_monster_data['num'] += $user_win_info['num'];
-                            $push_feed_monster_data['total_gift_price'] += $push_user_monster_data['total_gift_price'];
-                        }else{//未中奖
-                            $push_user_monster_data['is_win'] = 2;
-                            $push_user_monster_data['gid'] = 0;
-                            $push_user_monster_data['gift_name'] = '';
-                            $push_user_monster_data['base_image'] = '';
-                            $push_user_monster_data['gift_price'] = 0;
-                            $push_user_monster_data['num'] = 0;
-                        }
-
-                        $push_data = [];
-                        $push_data['code'] = 3032;
-                        $push_data['msg'] = "抽卡个人结束播报";
-                        $push_data['data'] = $push_user_monster_data;
-                        $push = new Push();
-                        $push->xianxuan($push_data);
-                        // error_log(date('Y-m-d H:i:s').'_'.$v.'_'.$reslut."\r\n", 3, '1111.txt');
-                    }
-                }
+//                if(!empty($part_user_array)){
+//                    foreach ($part_user_array as $k => $v){
+//                        $push_user_monster_data = [];
+//                        $push_user_monster_data['win_type'] = $win_type;
+//                        $push_user_monster_data['type_name'] = db::name('monster')->where('type', $win_type)->value('type_name');
+//                        //是否中奖
+//                        $map = [];
+//                        $map['mid'] = $monster_log['id'];
+//                        $map['uid'] = $v;
+//                        $user_win_info = db::name('user_monster_win_log')->where($map)->find();
+//                        if($user_win_info){//中奖
+//                            $push_user_monster_data['is_win'] = 1;
+//                            $push_user_monster_data['gid'] = $win_gift_info['gid'];
+//                            $push_user_monster_data['gift_name'] = $win_gift_info['gift_name'];
+//                            $push_user_monster_data['base_image'] = localpath_to_netpath($win_gift_info['base_image']);
+//                            $push_user_monster_data['gift_price'] = $win_gift_info['gift_price'];
+//                            $push_user_monster_data['num'] = $user_win_info['num'];
+//                            $push_user_monster_data['total_gift_price'] = $win_gift_info['gift_price'] * $user_win_info['num'];
+//                            $push_feed_monster_data['num'] += $user_win_info['num'];
+//                            $push_feed_monster_data['total_gift_price'] += $push_user_monster_data['total_gift_price'];
+//                        }else{//未中奖
+//                            $push_user_monster_data['is_win'] = 2;
+//                            $push_user_monster_data['gid'] = 0;
+//                            $push_user_monster_data['gift_name'] = '';
+//                            $push_user_monster_data['base_image'] = '';
+//                            $push_user_monster_data['gift_price'] = 0;
+//                            $push_user_monster_data['num'] = 0;
+//                        }
+//
+//                        $push_data = [];
+//                        $push_data['code'] = 3032;
+//                        $push_data['msg'] = "抽卡个人结束播报";
+//                        $push_data['data'] = $push_user_monster_data;
+//                        $push = new Push();
+//                        $push->xianxuan($push_data);
+//                        // error_log(date('Y-m-d H:i:s').'_'.$v.'_'.$reslut."\r\n", 3, '1111.txt');
+//                    }
+//                }
 
+                $push_feed_monster_data['num'] = db::name('user_monster_win_log')->where(['mid'=>$monster_log['id']])->sum('num');
                 if($push_feed_monster_data['num'] > 0){
                     $push_feed_monster_data['is_push_message'] = 1;
+                    $push_feed_monster_data['total_gift_price'] = $win_gift_info['gift_price'] * $push_feed_monster_data['num'];
                 }
 
                 $push_data = [];

application/api/model/Nobility.php

@@ -129,7 +129,7 @@ class Nobility extends Model
     }
 
     //购买爵位
-    public function buyNobility($user_id,$lid){
+    public function buyNobility($user_id,$lid,$is_send=0){
         $nobility_info = db::name('vs_nobility')
             ->field('lid,name,pay_price,renew_price,pay_coin,day,renew_coin')
             ->where('delete_time', 0)
@@ -245,9 +245,11 @@ class Nobility extends Model
             $pay_coin = $nobility_info['pay_coin'] ?? 0;
         }
         if($pay_coin > 0){
-            $reslut = model('common/UserWallet')->change_user_money($user_id, $pay_coin, model('common/UserWallet')::MONEYTYPECOIN, model('common/UserWallet')::NOBILITY_PURCHASE_COIN,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::NOBILITY_PURCHASE_COIN));
-            if (!$reslut) {
-                return ['code' => 0, 'msg' => '失败', 'data' => null];
+            if($is_send != 1){
+                $reslut = model('common/UserWallet')->change_user_money($user_id, $pay_coin, model('common/UserWallet')::MONEYTYPECOIN, model('common/UserWallet')::NOBILITY_PURCHASE_COIN,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::NOBILITY_PURCHASE_COIN));
+                if (!$reslut) {
+                    return ['code' => 0, 'msg' => '失败', 'data' => null];
+                }
             }
         }
 

application/api/model/Room.php

@@ -3026,7 +3026,8 @@ class Room extends Model
                 'label_id' => 7,
                 'type_id' => $type,
                 'room_up_pit_type' => 1,//1-排麦模式，2-自由模式
-                'sign_type' => 0 //0-等待签约
+                'sign_type' => 0, //0-等待签约
+                'is_hot' => 1,//1-等待上热门
             ];
         }
 

application/api/model/RoomPit.php

@@ -546,7 +546,7 @@ class RoomPit extends Model
             array_unshift($list['special'],$special);
         }
         if($list['special']){
-            foreach ($list['special'] as $k => $v){
+            foreach ($list['special'] as &$v){
                 //查询用户的爵位
                 $juewei = model('Nobility')->getUserNobilityInfo($v['user_id']);
                 if($juewei){

application/api/model/SendGift.php

@@ -288,7 +288,7 @@ class SendGift extends Model
             //查询礼物是否是盲盒
             if($gift_info['label'] == 2){//趣味礼物（盲盒）
                 //前端没传参数补偿
-                if(!$gift_bag_id){
+                if($gift_bag_id <= 0){
                     if($gid == 302){
                         $gift_bag_id = 7;
                     }elseif ($gid == 303){
@@ -856,7 +856,7 @@ class SendGift extends Model
             //查询礼物是否是盲盒
             if($gift_info['label'] == 2){//趣味礼物（盲盒）
                 //前端没传参数补偿
-                if(!$gift_bag_id){
+                if($gift_bag_id <= 0){
                     if($gid == 302){
                         $gift_bag_id = 7;
                     }elseif ($gid == 303){
@@ -1490,7 +1490,10 @@ class SendGift extends Model
                 return ['code' => 0, 'msg' => '当前盲盒不存在', 'data' => []];
             }
             $periods = $gift_bag['periods'] ?? 0;
-            $bag_gift = db::name("vs_gift")->where(['gid'=>$gift_id])->find();// 获取盲盒信息
+            $bag_gift = db::name("vs_gift")->where(['gid'=>$gift_id,'is_show'=>1,'is_can_buy'=>1])->find();// 获取盲盒信息
+            if(empty($bag_gift)){
+                return ['code' => 0, 'msg' => '当前盲盒已关闭', 'data' => []];
+            }
             //随机获取一个礼物
             $where = [
                 'gift_bag_id' => $gift_bag_id,

application/api/model/User.php

@@ -484,18 +484,21 @@ class User extends Model
             foreach ($result as $item){
                 $userInfo = [];
                 $top_users_count = 0;
-                $users = json_decode($item['give_user_ids'], true);
-                if($users){
-                    foreach ($users as $kk => $user_id){
-                        $userInfo[$kk] = db::name('user')->where(['id' => $user_id['user_id']])->field('id user_id,nickname,avatar')->find();
-                        $userInfo[$kk]['count'] = $user_id['count'];
-                        $top_users_count ++;
+                if($item['give_user_ids'] != null){
+                    $users = json_decode($item['give_user_ids'], true);
+
+                    if($users && is_array($users)){
+                        foreach ($users as $kk => $user_id){
+                            $userInfo[$kk] = db::name('user')->where(['id' => $user_id['user_id']])->field('id user_id,nickname,avatar')->find();
+                            $userInfo[$kk]['count'] = $user_id['count'];
+                            $top_users_count ++;
+                        }
+                        //用户信息$userInfo 按照数量 count 排序且保留前三个
+                        usort($userInfo, function ($a, $b) {
+                            return $b['count'] - $a['count'];
+                        });
+                        $userInfo = array_slice($userInfo, 0, 3);
                     }
-                    //用户信息$userInfo 按照数量 count 排序且保留前三个
-                    usort($userInfo, function ($a, $b) {
-                        return $b['count'] - $a['count'];
-                    });
-                    $userInfo = array_slice($userInfo, 0, 3);
                 }
 
                 $data[] = [

application/api/model/UserCp.php

@@ -37,7 +37,7 @@ class UserCp extends Model
             ->where(['from_user_id' => $to_user_id, 'to_user_id' => $from_user_id,'status' => 0])
             ->find();
 
-        if($res && $res['createtime'] + 86400 < time()){//24小时内
+        if($res && $res['createtime'] - 86400 < time()){//24小时内
             //创建推送信息1：回应送礼 并创建Cp空间，
             $data = [
                 'from_user_id' => $from_user_id,

application/api/model/UserZone.php

@@ -82,7 +82,7 @@ class UserZone extends Model
         }
         $map['a.show_status'] = 1;//1:显示 0不显示
         $map['a.is_delete'] = 1;//是否删除 1否2是
-//        $map['b.status'] = ['<>',0];//是否注销 1正常，2禁止登录，0注销
+        $map['b.status'] = ['<>',0];//是否注销 1正常，2禁止登录，0注销
 
         $order_string = 'a.createtime desc'; //排序规则
 

application/common/service/RedpacketService.php

@@ -193,7 +193,7 @@ class RedpacketService
                 ->where('user_id',$userId)
                 ->where('createtime', '>=', strtotime(date('Y-m-d')))
                 ->count();
-            if($tady_red_num >= 5){
+            if($tady_red_num <= 5){
                 model('api/Tasks')->tasks_complete($userId,36);
             }
             return [