关系

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){
+//        if($label){
-            $where['label'] = $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/Guild.php

@@ -90,6 +90,7 @@ class Guild extends adminApi
            $list[$k]['status_str'] = $v['status'] == 1 ? '正常' : '解散';
            $list[$k]['createtime'] = date('Y-m-d H:i:s',$v['createtime']);
            $list[$k]['updatetime'] = date('Y-m-d H:i:s',$v['updatetime']);
+           $list[$k]['delete_time'] = $v['delete_time'] ? date('Y-m-d H:i:s',$v['delete_time']) : "无";
            $list[$k]['user_id'] = $user['user_code']??"";
            $list[$k]['intro'] = $v['intro'];
            //幸运币流水
@@ -699,6 +700,11 @@ class Guild extends adminApi
                 //更新公会人数
                 db('vs_guild')->where('id', $merge_guild_id)->setInc('num');
                 //拉用户进入工会群聊
+                if($merge_guild_id<=95){
+                    $merge_guild_id = "g".$merge_guild_id;
+                }else{
+                    $merge_guild_id = $merge_guild_id;
+                }
                 $rid = 'g'.$merge_guild_id;
                 $reslut = model('api/Tencent')->add_group_member($rid, $value['user_id']);
             }
@@ -708,6 +714,11 @@ class Guild extends adminApi
                 return V(0,"失败");
             }
             //解散群
+            if($guild_id<=95){
+                $guild_id = "g".$guild_id;
+            }else{
+                $guild_id = $guild_id;
+            }
             model('api/Tencent')->delete_group('g'.$guild_id);
             db::commit();
             return V(1,"成功");

application/adminapi/controller/Lottery.php

@@ -30,7 +30,7 @@ class Lottery extends adminApi
      * 配置列表
      */
     public function config_list(){
-        $list = db::name("bb_lottery_config")->order('sort desc')->select();
+        $list = db::name("bb_lottery_config")->where(['delete_time' => 0])->order('sort desc')->select();
         $list_data = [];
         foreach ($list as $k=>$v){
             $list_data[$k]['id'] = $v['id'];
@@ -203,11 +203,15 @@ class Lottery extends adminApi
             //奖项类型：1-小奖 2-大奖
             if($v['prize_type']==4){
                 $lists_data[$k]['prize_type_str'] = "高级奖";
+                $gift_price = 10;
             }elseif ($v['prize_type']==2){
+                $gift_price = 1;
                 $lists_data[$k]['prize_type_str'] = "大奖";
             }elseif ($v['prize_type']==3){
+                $gift_price = 5;
                 $lists_data[$k]['prize_type_str'] = "中级奖";
             }else{
+                $gift_price = 1;
                 $lists_data[$k]['prize_type_str'] = "小奖";
             }
 
@@ -215,7 +219,7 @@ class Lottery extends adminApi
             $lists_data[$k]['status_str'] = $v['status']==1?"已发放":"未发放";
             $lists_data[$k]['createtime'] = date("Y-m-d H:i:s", $v['createtime']);
             $lists_data[$k]['prize_amount'] = floor($v['prize_amount']);
-            $lists_data[$k]['beilv'] = floor($v['prize_amount']);
+            $lists_data[$k]['beilv'] = floor($v['prize_amount'] / $gift_price);
         }
         $return_data = [
             'page' =>$page,
@@ -292,4 +296,67 @@ class Lottery extends adminApi
         ];
         return V(1,"成功", $return_data);
     }
+
+    /*
+     * 抽奖记录
+     */
+    public function pool_flow_list(){
+        $page = input('page', 1);
+        $page_limit = input('page_limit', 30);
+        $stime = input('stime', '');
+        $etime = input('etime', '');
+        $pool_type = input('pool_type', '1');
+        $user_code = input('user_code');
+        if($user_code){
+            $userId = db::name('user')->where(['user_code'=>$user_code])->value('id');
+            if($userId){
+                $where['uid'] = $userId;
+            }else{
+                $where['uid'] = '1';
+            }
+        }
+        if($pool_type == 4){
+            $table = 'bb_lottery_gift_record_10';
+        }
+        elseif($pool_type == 3){
+            $table = 'bb_lottery_gift_record_5';
+        }
+        else{
+            $table = 'bb_lottery_gift_record';
+        }
+        $where = [];
+        if($stime!==""){
+            $where['create_time'] = ['>=', strtotime($stime)];
+        }
+        if($etime!==""){
+            $where['create_time'] = ['<=', strtotime($etime)];
+        }
+        if($stime!=="" && $etime!==""){
+            $where['create_time'] = ['between', [strtotime($stime), strtotime($etime)]];
+        }
+        $count = db::name($table)->where($where)->count();
+        $lists_data = db::name($table)
+            ->field('id,send_uid,recv_uid,gift_id,gift_gold,recv_gold,small_pool_add,remark,create_time as createtime')
+            ->where($where)
+            ->order("id desc")
+            ->page($page, $page_limit)->select();
+        foreach ($lists_data as $k=>$v){
+            $send_user_info = db::name('user')->field('nickname,user_code')->where(['id'=>$v['send_uid']])->find();
+            $recv_user_info = db::name('user')->field('nickname,user_code')->where(['id'=>$v['recv_uid']])->find();
+            $lists_data[$k]['send_nickname'] = $send_user_info['user_code']."-".$send_user_info['nickname'];
+            $lists_data[$k]['recv_nickname'] = $recv_user_info['user_code']."-".$recv_user_info['nickname'];
+            $lists_data[$k]['gift_name'] = db::name('vs_gift')->where(['gid'=>$v['gift_id']])->value('gift_name');
+            $lists_data[$k]['createtime'] = date("Y-m-d H:i:s", $v['createtime']);
+        }
+        $return_data = [
+            'page' =>$page,
+            'page_limit' => $page_limit,
+            'count' => $count,
+            'lists' => $lists_data,
+            'total_data' => [
+            ]
+        ];
+        return V(1,"成功", $return_data);
+
+    }
 }

application/adminapi/controller/Monster.php

@@ -0,0 +1,146 @@
+<?php
+
+namespace app\adminapi\controller;
+
+use app\admin\model\AdminLog;
+use app\common\controller\adminApi;
+use think\Cache;
+use think\Config;
+use think\Db;
+
+class Monster extends adminApi
+{
+
+
+    //获取列表
+    public function get_monster_list()
+    {
+        $order = input('order', 'id');
+        $sort = input('sort', 'desc');
+        $page = input('page', 1);
+        $limit = input('limit', 20);
+        $reslut = model('Monster')->get_monster_list($order, $sort, $page, $limit);
+        $data = [];
+        $data['code'] = 0;
+        $data['msg'] = '获取成功';
+        $data['count'] = $reslut['data']['count'];
+        $data['data'] = $reslut['data']['list'];
+        return V(1,"成功", $data);
+    }
+
+    //获取详情
+    public function get_monster_info()
+    {
+        $id = input('id', 0);
+        $reslut = model('Monster')->get_monster_info($id);
+        return V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
+    //编辑
+    public function edit_monster()
+    {
+
+        $data['id'] = input('id', 0);
+        $data['gid'] = input('gid', 0);
+        $data['num'] = input('num', 0);
+        $data['type_name'] = input('type_name', 0);
+        $data['multiple'] = input('multiple', 0);
+
+        $reslut = model('Monster')->edit_monster($data);
+        return V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
+    
+    //获取礼物列表
+    public function get_gift_list()
+    {
+        $reslut = model('Monster')->get_gift_list();
+        $data = [];
+        $data['code'] = 0;
+        $data['msg'] = '获取成功';
+        $data['count'] = $reslut['data']['count'];
+        $data['data'] = $reslut['data']['list'];
+        return V(1,"成功", $data);
+    }
+    
+    
+    //获取列表
+    public function get_monster_multiple_list()
+    {
+        $order = input('order', 'id');
+        $sort = input('sort', 'desc');
+        $page = input('page', 1);
+        $limit = input('limit', 20);
+        $reslut = model('Monster')->get_monster_multiple_list($order, $sort, $page, $limit);
+        $data = [];
+        $data['code'] = 0;
+        $data['msg'] = '获取成功';
+        $data['count'] = $reslut['data']['count'];
+        $data['data'] = $reslut['data']['list'];
+        return V(1,"成功", $data);
+    }
+
+    //获取详情
+    public function get_monster_multiple_info()
+    {
+        $id = input('id', 0);
+        $reslut = model('Monster')->get_monster_multiple_info($id);
+        return V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
+    //编辑
+    public function edit_monster_multiple()
+    {
+        $data['id'] = input('id', 0);
+        $data['multiple'] = input('multiple', 0);
+        $reslut = model('Monster')->edit_monster_multiple($data);
+        return V($reslut['code'],$reslut['msg'], $reslut['data']);
+    }
+    
+    //获取列表
+    public function get_monster_log(){
+        $order = input('order', 'id');
+        $sort = input('sort', 'desc');
+        $page = input('page', 1);
+        $limit = input('limit', 20);
+        $reslut = model('Monster')->get_monster_log($order, $sort, $page, $limit);
+        $data = [];
+        $data['code'] = 0;
+        $data['msg'] = '获取成功';
+        $data['count'] = $reslut['data']['count'];
+        $data['data'] = $reslut['data']['list'];
+        $data['totalRow'] = $reslut['data']['totalRow'];
+        return V(1,"成功", $data);
+    }
+    
+    //获取列表
+    public function get_user_monster_log(){
+        $mid = input('mid', 0);
+        $order = input('order', 'id');
+        $sort = input('sort', 'desc');
+        $page = input('page', 1);
+        $limit = input('limit', 20);
+        $reslut = model('Monster')->get_user_monster_log($mid, $order, $sort, $page, $limit);
+        $data = [];
+        $data['code'] = 0;
+        $data['msg'] = '获取成功';
+        $data['count'] = $reslut['data']['count'];
+        $data['data'] = $reslut['data']['list'];
+        return V(1,"成功", $data);
+    }
+    
+    //获取列表
+    public function get_user_monster_win_log(){
+        $mid = input('mid', 0);
+        $order = input('order', 'id');
+        $sort = input('sort', 'desc');
+        $page = input('page', 1);
+        $limit = input('limit', 20);
+        $reslut = model('Monster')->get_user_monster_win_log($mid, $order, $sort, $page, $limit);
+        $data = [];
+        $data['code'] = 0;
+        $data['msg'] = '获取成功';
+        $data['count'] = $reslut['data']['count'];
+        $data['data'] = $reslut['data']['list'];
+        return V(1,"成功", $data);
+    }
+    
+    
+}

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;
@@ -857,6 +860,7 @@ class User extends adminApi
         $type = input('type', 1);
         $type_text = input('type_text', '');
         $block_time = input('block_time', 0);
+        $ban_eason = input('ban_eason', 0);
         $admin_id = Session::get('admin_id');
         //插入fa_block 表
         $res = Db::name('block')->insert([
@@ -865,10 +869,27 @@ class User extends adminApi
             'type_text' => $type_text,
             'block_time' => strtotime($block_time),
             'createtime' => time(),
+            'ban_eason' => $ban_eason,
         ]);
         if (!$res) {
             return V(0, "添加失败");
         }
+        //1账号, 2设备, 3ip 4禁言
+        if($type == 1){
+            $user_id = db::name('user')->where('user_code', $type_text)->value('id');
+        }
+        if($type == 2){
+            $user_id = db::name('user')->where('login_device', $type_text)->value('id');
+        }
+        if($type == 3){
+            $user_id = db::name('user')->where('loginip', $type_text)->value('id');
+        }
+        if(isset($user_id)){
+            $token = db::name('user_token')->where('user_id', $user_id)->value('token');
+            // 删除这个Token，使其失效
+            TokenLib::delete($token);
+        }
+
         return V(1,"添加成功", null);
     }
     /*

application/adminapi/model/Monster.php

@@ -0,0 +1,253 @@
+<?php
+
+namespace app\adminapi\model;
+
+use think\Db;
+use think\Model;
+
+class Monster extends Model
+{
+    //列表
+    public function get_monster_list($order, $sort, $page = 1, $limit = 20)
+    {
+
+        $list = db::name('Monster')->order($order, $sort)->page($page, $limit)->select();
+        $total_num = db::name('Monster')->sum('num');
+        foreach ($list as $k => &$v) {
+            $gift_info = db::name('vs_gift')->where('gid', $v['gid'])->find();
+            $v['gift_name'] = $gift_info['gift_name'];
+            $v['base_image'] = localpath_to_netpath($gift_info['base_image']);
+            $v['gift_price'] = $gift_info['gift_price'];
+            $v['rate'] = round(($v['num']/$total_num), 6) * 100;
+            $v['rate'] .= '%';
+            $v['createtime'] = date('Y-m-d H:i:s', $v['createtime']);
+            $v['updatetime'] = date('Y-m-d H:i:s', $v['updatetime']);
+        }
+        $data = [];
+        $data['count'] = db::name('Monster')->count();
+        $data['list'] = $list;
+        return ['code' => 1, 'msg' => '获取成功', 'data' => $data];
+    }
+    
+    //获取礼物列表
+    public function get_gift_list(){
+        $map = [];
+        // $map[] = ['gid', 'not in', [36,37,38]];
+        $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();
+        $data = [];
+        $data['count'] = db::name('vs_gift')->where($map)->count();
+        $data['list'] = $list;
+        return ['code' => 1, 'msg' => '获取成功', 'data' => $data];
+        
+        
+    }
+    
+    //编辑
+    public function edit_monster($data)
+    {
+        if (empty($data)) {
+            return ['code' => 0, 'msg' => '参数异常', 'data' => null];
+        }
+        
+        $monster_info = db::name('Monster')->find($data['id']);
+        if (empty($monster_info)) {
+            return ['code' => 0, 'msg' => '参数异常', 'data' => null];
+        }
+        
+        $map = [];
+        $map['gid'] = ['=', $data['gid']];
+//        $map['type'] = ['=', 1];
+        $map['is_show'] = ['=',1];
+        $map['delete_time'] = ['=', 0];
+        $gift_info = db::name('vs_gift')->where($map)->find();
+        if(!$gift_info){
+            return ['code' => 0, 'msg' => '配置礼物不存在', 'data' => null];
+        }
+        
+        if($monster_info['multiple'] * 10 != $gift_info['gift_price']){
+            return ['code' => 0, 'msg' => '配置礼物的价格必须为倍数的10倍', 'data' => null];
+        }
+        
+        Db::startTrans();
+        try {
+            
+            $update_data = [];
+            $update_data['type_name'] = $data['type_name'];
+            if($data['multiple']){
+                $update_data['multiple'] = $data['multiple'];
+            }
+            $update_data['gid'] = $data['gid'];
+            $update_data['num'] = $data['num'];
+            $update_data['updatetime'] = time();
+            $reslut = db::name('Monster')->where(['id' => $data['id']])->update($update_data);
+            if (!$reslut) {
+                Db::rollback();
+                return ['code' => 0, 'msg' => '修改失败', 'data' => null];
+            }
+            
+            Db::commit();
+            return ['code' => 1, 'msg' => '修改成功', 'data' => null];
+        } catch (\Exception $e) {
+            // 回滚事务
+            dump($e);
+            Db::rollback();
+            return ['code' => 0, 'msg' => '修改失败', 'data' => null];
+        }
+        
+            
+    }
+    
+    //获取信息
+    public function get_monster_info($id)
+    {
+        if (empty($id)) {
+            return ['code' => 201, 'msg' => '参数异常', 'data' => null];
+        }
+        $monster_info = db::name('Monster')->where(['id' => $id])->find();
+        return ['code' => 1, 'msg' => '获取成功', 'data' => $monster_info];
+    }
+    
+    
+    //列表
+    public function get_monster_multiple_list($order, $sort, $page = 1, $limit = 20)
+    {
+
+        $list = db::name('monster_multiple')->order($order, $sort)->page($page, $limit)->select();
+        foreach ($list as $k => &$v) {
+            
+        }
+        $data = [];
+        $data['count'] = db::name('monster_multiple')->count();
+        $data['list'] = $list;
+        return ['code' => 1, 'msg' => '获取成功', 'data' => $data];
+    }
+    
+    //编辑
+    public function edit_monster_multiple($data)
+    {
+        if (empty($data)) {
+            return ['code' => 201, 'msg' => '参数异常', 'data' => null];
+        }
+        
+        $monster_info = db::name('monster_multiple')->find($data['id']);
+        if (empty($monster_info)) {
+            return ['code' => 201, 'msg' => '参数异常', 'data' => null];
+        }
+        
+        Db::startTrans();
+        try {
+            
+            $update_data = [];
+            $update_data['multiple'] = $data['multiple'];
+            $update_data['updatetime'] = time();
+            $reslut = db::name('monster_multiple')->where(['id' => $data['id']])->update($update_data);
+            if (!$reslut) {
+                Db::rollback();
+                return ['code' => 0, 'msg' => '修改失败', 'data' => null];
+            }
+            
+            Db::commit();
+            return ['code' => 1, 'msg' => '修改成功', 'data' => null];
+        } catch (\Exception $e) {
+            // 回滚事务
+            dump($e);
+            Db::rollback();
+            return ['code' => 0, 'msg' => '修改失败', 'data' => null];
+        }
+        
+            
+    }
+    
+    //获取信息
+    public function get_monster_multiple_info($id)
+    {
+        if (empty($id)) {
+            return ['code' => 0, 'msg' => '参数异常', 'data' => null];
+        }
+        $monster_info = db::name('monster_multiple')->where(['id' => $id])->find();
+        return ['code' => 1, 'msg' => '获取成功', 'data' => $monster_info];
+    }
+    
+    
+    //列表
+    public function get_monster_log($order, $sort, $page = 1, $limit = 20)
+    {
+
+        $list = db::name('monster_log')->order($order, $sort)->page($page, $limit)->select();
+        foreach ($list as $k => &$v) {
+            $v['type_name'] = '暂未开奖';
+            $v['gid'] = 0;
+            $v['gift_name'] = '';
+            $v['base_image'] = '';
+            $v['gift_price'] = 0;
+            if($v['is_delete'] == 2){
+                $gift_info = db::name('Monster')->alias('a')->join('vs_gift b', 'a.gid = b.gid')->field('b.gid,b.gift_name,b.base_image,b.gift_price,a.type_name')->where('a.type', $v['win_type'])->find();
+                $v['gid'] = $gift_info['gid'];
+                $v['gift_name'] = $gift_info['gift_name'];
+                $v['base_image'] = localpath_to_netpath($gift_info['base_image']);
+                $v['gift_price'] = $gift_info['gift_price'];
+                $v['type_name'] = $gift_info['type_name'];
+                $v['createtime'] = date('Y-m-d H:i:s', $v['createtime']);
+                $v['updatetime'] = date('Y-m-d H:i:s', $v['updatetime']);
+                $v['end_time'] = date('Y-m-d H:i:s', $v['end_time']);
+            }
+        }
+        $data = [];
+        $data['count'] = db::name('monster_log')->count();
+        $data['list'] = $list;
+        $totalRowData = db::name('monster_log')->field('count(1) as count,SUM(out_amount) as out_amount,SUM(in_amount) as in_amount')->find();
+        unset($totalRowData['count']);
+        $data['totalRow'] = $totalRowData;
+        return ['code' => 1, 'msg' => '获取成功', 'data' => $data];
+    }
+    
+    //列表
+    public function get_user_monster_log($mid, $order, $sort, $page = 1, $limit = 20)
+    {
+
+        $list = db::name('user_monster_log')->where('mid', $mid)->order($order, $sort)->page($page, $limit)->select();
+        foreach ($list as $k => &$v) {
+            $user_info = db::name('user')->where('id', $v['uid'])->field('id,nickname,avatar')->find();
+            $v['nickname'] = $user_info['nickname'];
+            $v['avatar'] = localpath_to_netpath($user_info['avatar']);
+            $v['type_name'] = db::name('Monster')->where('type', $v['type'])->value('type_name');
+            $v['createtime'] = date('Y-m-d H:i:s', $v['createtime']);
+            $v['updatetime'] = date('Y-m-d H:i:s', $v['updatetime']);
+        }
+        
+        $data = [];
+        $data['count'] = db::name('user_monster_log')->where('mid', $mid)->count();
+        $data['list'] = $list;
+        return ['code' => 1, 'msg' => '获取成功', 'data' => $data];
+    }
+    
+    //列表
+    public function get_user_monster_win_log($mid, $order, $sort, $page = 1, $limit = 20)
+    {
+
+        $list = db::name('user_monster_win_log')->where('mid', $mid)->order($order, $sort)->page($page, $limit)->select();
+        foreach ($list as $k => &$v) {
+            $user_info = db::name('user')->where('id', $v['uid'])->field('id,nickname,avatar')->find();
+            $v['nickname'] = $user_info['nickname'];
+            $v['avatar'] = localpath_to_netpath($user_info['avatar']);
+            $v['type_name'] = db::name('Monster')->where('type', $v['win_type'])->value('type_name');
+            $gift_info = db::name('vs_gift')->where('gid', $v['win_gid'])->field('gid,gift_name,base_image,gift_price')->find();
+            $v['gift_name'] = $gift_info['gift_name'];
+            $v['base_image'] = localpath_to_netpath($gift_info['base_image']);
+            $v['gift_price'] = $gift_info['gift_price'];
+            $v['createtime'] = date('Y-m-d H:i:s', $v['createtime']);
+            $v['updatetime'] = date('Y-m-d H:i:s', $v['updatetime']);
+        }
+        $data = [];
+        $data['count'] = db::name('user_monster_win_log')->where('mid', $mid)->count();
+        $data['list'] = $list;
+        return ['code' => 1, 'msg' => '获取成功', 'data' => $data];
+    }
+    
+    
+    
+}

application/api/controller/BlindBoxTurntable.php

@@ -40,7 +40,7 @@ class BlindBoxTurntable extends BaseCom
         $num = input('num',1);
         $heart_id = input('heart_id',0);
         $auction_id = input('auction_id',0);
-        if(!in_array($gift_bag_id,[10,11,12])){
+        if(!in_array($gift_bag_id,[10,11,12,61])){
             return v(0,'非法活动ID', null);
         }
         //删除字符串里所有的空格

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();
+            $gift_list[$key]['number'] = $key;
-            if($gift_data){
+            $gift_list[$key]['gift_id'] = $value['gid'];
-                $gift_list[$key]['number'] = $key;
+            $gift_list[$key]['gift_name'] = $value['gift_name'];
-                $gift_list[$key]['gift_id'] = $gift_data['gid'];
+            $gift_list[$key]['base_image'] = $value['base_image'];
-                $gift_list[$key]['gift_name'] = $gift_data['gift_name'];
+            $gift_list[$key]['play_image'] = $value['play_image'];
-                $gift_list[$key]['base_image'] = $gift_data['base_image'];
+            $gift_list[$key]['gift_price'] = $value['gift_price'];
-                $gift_list[$key]['play_image'] = $gift_data['play_image'];
-                $gift_list[$key]['gift_price'] = $gift_data['gift_price'];
-            }
         }
         $ext = json_decode($box['ext'],true);
         $box_gift = Db::name('vs_gift')->where('gid',$ext['gift_id'])->find();
@@ -465,7 +465,7 @@ class BlindBoxTurntableGift extends Model
 
     //盲盒转盘开启状态
     public function blind_box_status($user_id=0){
-        $gift_bag_ids = [11,12,60];
+        $gift_bag_ids = [11,12,60,61];
         $gift_bag = db::name('vs_gift_bag')->where(['id'=>['in',$gift_bag_ids]])->select();
         $open_monster_status = get_system_config_value('open_monster_status');
         $fun_activities_recharge_restrictions = get_system_config_value('fun_activities_recharge_restrictions');
@@ -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/BlindBoxTurntableGiftDrawWorldNew.php

@@ -38,6 +38,10 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
     public function draw_gift(int $gift_bag_id, int $user_id, string $gift_user_ids,  $num = 1,  $room_id = 0,  $heart_id = 0, $auction_id = 0)
     {
         try {
+            $bag_data = db::name("vs_gift_bag")->field('id,status')->where('id', $gift_bag_id)->find();
+            if($bag_data['status']==0){ //其他转盘游戏
+                return ['code' => 0, 'msg' => '游戏已关闭', 'data' => null];
+            }
             // 收礼人
             $gift_user_ids = explode(',', $gift_user_ids);
             $total_num   = $num * count($gift_user_ids); //总数量
@@ -1074,9 +1078,13 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
     {
         $resultList = [];
         foreach ($giftCounts as $gift) {
+            $gift_data = Db::name('vs_gift')->where(['gid'=>$gift['gift_id']])->find();
             $resultList[] = [
                 'gift_id' => $gift['gift_id'],
-                'count' => $gift['count']
+                'count' => $gift['count'],
+                'gift_price' => $gift_data['gift_price'],
+                'gift_name' => $gift_data['gift_name'],
+                'base_image' => $gift_data['base_image'],
             ];
         }
         return [
@@ -1105,6 +1113,10 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
             return ['code' => 0, 'msg' => '用户不在房间，无法获取房主信息', 'data' => null];
         }
         $gift_bag_id = 13;
+        $bag_data = db::name("vs_gift_bag")->field('id,status')->where('id', $gift_bag_id)->find();
+        if($bag_data['status']==0){ //其他转盘游戏
+            return ['code' => 0, 'msg' => '游戏已关闭', 'data' => null];
+        }
         // 1. 获取并缓存盲盒配置
         $ext    = $this->getCachedGiftBag($gift_bag_id);  //获取转盘信息
         $bag_gift_price = $ext['xlh_box_price'] * $num;
@@ -1536,6 +1548,18 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
     public function draw_gift_drop_bag($gift_bag_id, $user_id, $num = 1, $room_id = 0)
     {
         try {
+            $open_monster_status = get_system_config_value('open_monster_status');
+            $fun_activities_recharge_restrictions = get_system_config_value('fun_activities_recharge_restrictions');
+            if($fun_activities_recharge_restrictions == 0){
+                return ['code' => 0, 'msg' => '趣味活动关闭', 'data' => null];
+            }
+            if($gift_bag_id ==60 && $open_monster_status ==0){ //恋仙传说
+                return ['code' => 0, 'msg' => '游戏已关闭', 'data' => null];
+            }
+            $bag_data = db::name("vs_gift_bag")->field('id,status')->where('id', $gift_bag_id)->find();
+            if(in_array($gift_bag_id,[11,12,61]) && $bag_data['status']==0){ //其他转盘游戏
+                return ['code' => 0, 'msg' => '游戏已关闭', 'data' => null];
+            }
             // 参数验证
             $validation_result = $this->validateDrawParams($gift_bag_id, $user_id, $num);
             if ($validation_result['code'] !== 1) {

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');
+                $pool_gift_id_arr[] = 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_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/Lottery.php

@@ -150,12 +150,15 @@ class Lottery extends Model
         try {
             $gift_gold = $gift_price;
             if($poole_type == 5){
+                $text = '中级';
                 $small_prize_play_image = db::name('bb_lottery_config')->where(['key' => 'big_prize_play_image'])->value('value');
                 $service = new LotteryService5();
             }elseif($poole_type == 10){
+                $text = '高级';
                 $small_prize_play_image = db::name('bb_lottery_config')->where(['key' => 'gao_prize_play_image'])->value('value');
                 $service = new LotteryService10();
             }else{
+                $text = '初级';
                 $small_prize_play_image = db::name('bb_lottery_config')->where(['key' => 'small_prize_play_image'])->value('value');
                 $service = new LotteryService();
             }
@@ -175,7 +178,7 @@ class Lottery extends Model
                             return ['code' => 0, 'msg' => '流水记录失败', 'data' => null];
                         }
 
-                        $tet['text'] = '恭喜用户'.$fromUserInfo['nickname'].'在幸运币活动中获得幸运币'.$beilv.'倍';
+                        $tet['text'] = '恭喜用户'.$fromUserInfo['nickname'].'在'.$text.'幸运币活动中获得幸运币'.$beilv.'倍';
                         $tet['type'] = 2;
                         $tet['beilv'] = $beilv;
                         $tet['play_image'] = $small_prize_play_image;
@@ -185,7 +188,7 @@ class Lottery extends Model
 
                         $push = new Push($send_uid, $room_id);
                         $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name');
-                        $text = '恭喜'.$fromUserInfo['nickname'] . '在' . $room_name . '房间获得幸运币'. $beilv . '倍';
+                        $text = '恭喜'.$fromUserInfo['nickname'] . '在' . $room_name . '房间获得'.$text.'幸运币'. $beilv . '倍';
                         $text_list_new[] = [
                             'text' => $text,
                             'gift_picture' => $gift_info['base_image'],

application/api/model/Monster.php

@@ -123,12 +123,15 @@ class Monster extends Model
                             $in_amount += $win_gift_info['gift_price'] * $wim_num;
 
                             //礼物送到背包
-                            $reslut = model('api/UserGiftPack')->change_user_gift_pack($b, $win_gift_info['gid'], $wim_num, model('UserGiftPack')::LY_DRAW_GIFT_GET, '炼仙传说中奖获取');
+                            if($wim_num > 0){
-                            if($reslut['code'] == 0){
+                                $reslut = model('api/UserGiftPack')->change_user_gift_pack($b, $win_gift_info['gid'], $wim_num, model('UserGiftPack')::LY_DRAW_GIFT_GET, '炼仙传说中奖获取');
-                                Db::rollback();
+                                if($reslut['code'] == 0){
-                                return ['code' => 0, 'msg' => $reslut['msg'], 'data' => null];
+                                    Db::rollback();
+                                    return ['code' => 0, 'msg' => $reslut['msg'], 'data' => null];
+                                }
                             }
 
+
                             //用户中奖信息
                             $insert = [];
                             $insert['uid'] = $b;
@@ -239,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)){
+//                if(!empty($part_user_array)){
-                    foreach ($part_user_array as $k => $v){
+//                    foreach ($part_user_array as $k => $v){
-                        $push_user_monster_data = [];
+//                        $push_user_monster_data = [];
-                        $push_user_monster_data['win_type'] = $win_type;
+//                        $push_user_monster_data['win_type'] = $win_type;
-                        $push_user_monster_data['type_name'] = db::name('monster')->where('type', $win_type)->value('type_name');
+//                        $push_user_monster_data['type_name'] = db::name('monster')->where('type', $win_type)->value('type_name');
-                        //是否中奖
+//                        //是否中奖
-                        $map = [];
+//                        $map = [];
-                        $map['mid'] = $monster_log['id'];
+//                        $map['mid'] = $monster_log['id'];
-                        $map['uid'] = $v;
+//                        $map['uid'] = $v;
-                        $user_win_info = db::name('user_monster_win_log')->where($map)->find();
+//                        $user_win_info = db::name('user_monster_win_log')->where($map)->find();
-                        if($user_win_info){//中奖
+//                        if($user_win_info){//中奖
-                            $push_user_monster_data['is_win'] = 1;
+//                            $push_user_monster_data['is_win'] = 1;
-                            $push_user_monster_data['gid'] = $win_gift_info['gid'];
+//                            $push_user_monster_data['gid'] = $win_gift_info['gid'];
-                            $push_user_monster_data['gift_name'] = $win_gift_info['gift_name'];
+//                            $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['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['gift_price'] = $win_gift_info['gift_price'];
-                            $push_user_monster_data['num'] = $user_win_info['num'];
+//                            $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_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['num'] += $user_win_info['num'];
-                            $push_feed_monster_data['total_gift_price'] += $push_user_monster_data['total_gift_price'];
+//                            $push_feed_monster_data['total_gift_price'] += $push_user_monster_data['total_gift_price'];
-                        }else{//未中奖
+//                        }else{//未中奖
-                            $push_user_monster_data['is_win'] = 2;
+//                            $push_user_monster_data['is_win'] = 2;
-                            $push_user_monster_data['gid'] = 0;
+//                            $push_user_monster_data['gid'] = 0;
-                            $push_user_monster_data['gift_name'] = '';
+//                            $push_user_monster_data['gift_name'] = '';
-                            $push_user_monster_data['base_image'] = '';
+//                            $push_user_monster_data['base_image'] = '';
-                            $push_user_monster_data['gift_price'] = 0;
+//                            $push_user_monster_data['gift_price'] = 0;
-                            $push_user_monster_data['num'] = 0;
+//                            $push_user_monster_data['num'] = 0;
-                        }
+//                        }
-
+//
-                        $push_data = [];
+//                        $push_data = [];
-                        $push_data['code'] = 3032;
+//                        $push_data['code'] = 3032;
-                        $push_data['msg'] = "抽卡个人结束播报";
+//                        $push_data['msg'] = "抽卡个人结束播报";
-                        $push_data['data'] = $push_user_monster_data;
+//                        $push_data['data'] = $push_user_monster_data;
-                        $push = new Push();
+//                        $push = new Push();
-                        $push->xianxuan($push_data);
+//                        $push->xianxuan($push_data);
-                        // error_log(date('Y-m-d H:i:s').'_'.$v.'_'.$reslut."\r\n", 3, '1111.txt');
+//                        // 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($is_send != 1){
-            if (!$reslut) {
+                $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));
-                return ['code' => 0, 'msg' => '失败', 'data' => null];
+                if (!$reslut) {
+                    return ['code' => 0, 'msg' => '失败', 'data' => null];
+                }
             }
         }
 

application/api/model/Room.php

@@ -2753,7 +2753,7 @@ class Room extends Model
         $user_info['is_room_owner'] = db::name('vs_room')->where(['id' => $room_id, 'user_id' => $user_id])->find() ? 1 : 0;
         $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;
+        $user_info['gift_num'] = db::name('user_gift_wall')->where(['user_id' => $user_id])->sum('count')?? 0;
 
         $user_info['qinmi'] = null;
         $user_info['zhenai'] = null;
@@ -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){
@@ -1483,11 +1483,17 @@ class SendGift extends Model
         //获取盲盒配置
         if($gift_bag_id){
             $gift_bag = db::name("vs_gift_bag")->where(['id'=>$gift_bag_id])->find();
+            if($gift_bag['status'] ==0){
+                return ['code' => 0, 'msg' => '当前盲盒已关闭', 'data' => []];
+            }
             if(!$gift_bag){
                 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($item['give_user_ids'] != null){
-                if($users){
+                    $users = json_decode($item['give_user_ids'], true);
-                    foreach ($users as $kk => $user_id){
+
-                        $userInfo[$kk] = db::name('user')->where(['id' => $user_id['user_id']])->field('id user_id,nickname,avatar')->find();
+                    if($users && is_array($users)){
-                        $userInfo[$kk]['count'] = $user_id['count'];
+                        foreach ($users as $kk => $user_id){
-                        $top_users_count ++;
+                            $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/controller/BaseCom.php

@@ -78,7 +78,7 @@ class BaseCom extends Controller
 
         if (empty($token)) {
             // 3. Token为空，拒绝访问
-            return V(0, 'Token不能为空');
+            return V(301, 'Token不能为空');
         }
 
         // 4. 核心验证：检查Token是否有效

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 [

application/cron/controller/Test.php

@@ -34,6 +34,7 @@ class Test
 //        $this->createGuildSubsidyDataNew();
         // $this->repair_guild_room_data();
 //        $this->check_guild_room_data();
+//         $this->merge_guild();
 
     }
 
@@ -1094,4 +1095,83 @@ class Test
         }
         echo "完成";
     }
+
+    public function merge_guild(){die("暂停");
+        $guild_id = 10029; // 要合并的
+        $merge_guild_id = 10005;  //并入的
+        //解散工会
+        $guild = model('adminapi/Guild')->getOne(['guild_special_id'=>$guild_id]);
+        $merge_guild=model('adminapi/Guild')->getOne(['guild_special_id'=>$merge_guild_id]);
+//        if(empty($guild)){
+//           echo "该工会不存在";
+//        }
+//        if($guild['status'] == 2){
+//            echo "该工会已解散";
+//        }
+//        if(!$merge_guild_id){
+//            echo "请选择并入工会";
+//        }
+//        if(empty($merge_guild)){
+//            echo "并入工会不存在";
+//        }
+        $guild_id = $guild['id'];
+        $merge_guild_id = $merge_guild['id'];
+//        db::startTrans();
+//        try{
+//            $res = model('adminapi/Guild')->edit(['id'=>$guild_id],['status'=>2,'delete_time'=>time()]);
+            $merge_guild_user = db('vs_guild_user')->where(['guild_id'=>$guild_id,'quit_type'=>3,'status'=>1])->select();
+            $use_num = 0;
+            echo "公会名称：".$guild['guild_name']." 公会Id：".$guild_id." 公会人数：".count($merge_guild_user)." 合并公会名称：".$merge_guild['guild_name']." 合并公会Id：".$merge_guild_id."\n";
+            foreach ($merge_guild_user as $key=>$value){
+//                $res = db('vs_guild_user')->insert([
+//                    'user_id'=>$value['user_id'],
+//                    'guild_id'=>$merge_guild_id,
+//                    'room_id'=>$value['room_id'],
+//                    'status'=>$value['status'],
+//                    'is_show_room'=>$value['is_show_room'],
+//                    'remarks'=>"公会合并：从".$guild['guild_name']."合入".$merge_guild['guild_name'],
+//                    'settlement_ratio' =>$value['settlement_ratio'],
+//                    'apply_time'=>time(),
+//                    'createtime'=>time(),
+//                ]);
+//                if(!$res){
+//                    db::rollback();
+//                    return V(0,"失败");
+//                }
+                //更新公会人数
+//                db('vs_guild')->where('id', $merge_guild_id)->setInc('num');
+                //拉用户进入工会群聊
+                if($merge_guild_id<=95){
+                    $merge_guild_id = "g".$merge_guild_id;
+                }else{
+                    $merge_guild_id = $merge_guild_id;
+                }
+                $rid = 'g'.$merge_guild_id;
+//                $reslut = model('api/Tencent')->add_group_member($rid, $value['user_id']);
+//                if($reslut['code']==1){
+//                    echo "用户：".$value['user_id']."加入群聊：".$rid;
+//                    $use_num ++;
+//                }
+                echo 'u'.$value['user_id']."\n";
+            }
+        echo " 成功：".$use_num."\n";
+//            $return = db('vs_guild_user')->where(['guild_id'=>$guild_id,'quit_type'=>0])->update(['quit_type'=>3,'quit_time'=>time(),'updatetime'=>time(),'delete_time'=>time()]);
+//            if (!$return) {
+//                db::rollback();
+//                return V(0,"失败");
+//            }
+//            //解散群
+//            if($guild_id<=95){
+//                $guild_id = "g".$guild_id;
+//            }else{
+//                $guild_id = $guild_id;
+//            }
+//            model('api/Tencent')->delete_group('g'.$guild_id);
+//            db::commit();
+//            return V(1,"成功");
+//        } catch(\Exception $e) {
+//            db::rollback();
+//            return V(0,$e->getMessage());
+//        }
+    }
 }