动态

application/api/controller/Topicdongtai.php

@@ -19,18 +19,17 @@ class Topicdongtai extends Api
     public function addone(){
         $content = input('content','');
         $images = input('images','');
+
         $audio_file = input('audio_file','');
-        $topic_ids = input('topic_ids','');
-        $aite = input('aite','','htmlspecialchars_decode');
-        $type = input('type',1);
         $audio_second = input('audio_second',0);
 
-        if(!$content && !$images && !$audio_file){
-            $this->error(__('Invalid parameters'));
-        }
+        $video_file = input('video_file',0);
+
+        $type = input('type',1);//媒体类型:1=图片,2=语音,3=视频
+
 
-        if(!$this->user_auth_limit()){
-            $this->error('请先完成实名认证');
+        if(!$content && !$images && !$audio_file && !$video_file){
+            $this->error(__('Invalid parameters'));
         }
 
         //关键字替换
@@ -40,24 +39,25 @@ class Topicdongtai extends Api
         if($type == 1){
             $audio_file = '';
             $audio_second = 0;
+            $video_file = '';
+        }elseif($type == 2){
+            $images = '';
+            $video_file = '';
         }else{
+            $audio_file = '';
+            $audio_second = 0;
             $images = '';
         }
 
         $data = [
-            'topic_ids' => $topic_ids,
             'user_id' => $this->auth->id,
             'content' => $content,
             'images' => $images,
             'audio_file' => $audio_file,
-            'type'  => $type,
-            'cityname'  => input('cityname',''),
-            'provincename'  => input('provincename',''),
-            'aite'  => $aite,
-            'is_public'  => input('is_public',1),
             'audio_second'  => $audio_second,
-            'longitude'  => input('longitude',0),
-            'latitude'  => input('latitude',0),
+            'video_file'  => $video_file,
+            'type'  => $type,
+
             'createtime' => time(),
             'updatetime' => time(),
 
@@ -72,33 +72,18 @@ class Topicdongtai extends Api
 
         Db::startTrans();
         $id = Db::name('topic_dongtai')->insertGetId($data);
-        //圈子新增一个贴
-        $rs = Db::name('topic_hub')->where('id','IN',$topic_ids)->setInc('t_number');
 
         //task任务
         //发第一条动态
         $task_count = Db::name('topic_dongtai')->where('user_id',$this->auth->id)->count();
         if($task_count == 1){
-            $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,16);
+            $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,10);
             if($task_rs === false){
                 Db::rollback();
                 $this->error('完成任务失败');
             }
         }
 
-        //通知艾特的人
-        if(!empty($aite)){
-            $aite = json_decode($aite,true);
-            if(!empty($aite) && is_array($aite)){
-                foreach($aite as $key => $uid){
-                    //系统消息
-                    if(is_array($uid) && isset($uid['id'])){
-                        $msg_id = \app\common\model\Message::addMessage($uid['id'],'动态通知',$this->auth->nickname.'发布动态并@了你,快去看看吧','dongtai_aite',$id);
-                    }
-                }
-            }
-        }
-
         Db::commit();
 
         $this->success('发布成功',$id);
@@ -118,56 +103,29 @@ class Topicdongtai extends Api
 
         ];
         if($uid != $this->auth->id){
-            $where['dt.is_public'] = 1;  //不是自己的，就只能看公开的。公开:1=公开,2=私密
             $where['dt.auditstatus'] = 1;  //不是自己的，就只能看审核通过的
         }
 
         $list = Db::name('topic_dongtai')->alias('dt')
             ->join('user','dt.user_id = user.id','LEFT')
-            ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
+            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status')
             ->where($where)
             ->order('dt.id desc')->autopage()->select();
-        $list = list_domain_image($list,['images','audio_file','avatar']);
+        $list = list_domain_image($list,['images','audio_file','avatar','video_file']);
 
         if(!empty($list)){
             foreach($list as $key => &$val){
 
-                $val['aite'] = json_decode($val['aite'],true);
-
                 //用户年龄
                 $val['age'] = birthtime_to_age($val['birthday']);
                 unset($val['birthday']);
 
-                //用户vip
-                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
-                unset($val['vip_endtime']);
-
                 //追加点赞
                 $val['isgood'] = $this->is_good($val['id'],$this->auth->id);
 
                 //时间
                 $val['createtime_text'] = get_last_time($val['createtime']);
 
-                //关注
-                $val['is_follow'] = $this->is_follow($this->auth->id,$val['user_id']);
-
-                //收藏
-                $val['is_collect'] = $this->is_collect($val['id'],$this->auth->id);
-
-                //拉黑
-                $val['is_black'] = $this->is_black($this->auth->id,$val['user_id']);
-
-                //层主评论数量
-                $val['answernumber'] = Db::name('topic_dongtai_answer')->where(['dt_id'=>$val['id'],'level'=>1])->count();
-
-                //话题
-                $ids_str = $val['topic_ids'];
-                if($ids_str){
-                    $val['topic_text'] = Db::name('topic_hub')->where('id','IN',$val['topic_ids'])->orderRaw('field(id,'.$ids_str.')')->column('name');
-                }else{
-                    $val['topic_text'] = [];
-                }
             }
         }
 
@@ -185,50 +143,31 @@ class Topicdongtai extends Api
             $this->error('未找到动态信息');
         }
         Db::startTrans();
-        $delRes = Db::name('topic_dongtai')->where('id',$id)->where('user_id',$this->auth->id)->delete();
+        $delRes = Db::name('topic_dongtai')->where('id',$id)->delete();
         if (!$delRes) {
             Db::rollback();
             $this->error('动态删除失败');
         }
-        //话题少一个贴
-        if (!empty($dongtai['topic_ids'])) {
-            $res = Db::name('topic_hub')->where('id','IN',$dongtai['topic_ids'])->setDec('t_number');
-            /*话题可能被删掉了，这里不判断了
-            if (!$res) {
-                Db::rollback();
-                $this->error('更新话题数量失败');
-            }*/
-        }
-        //删除对应的评论，
-        Db::name('topic_dongtai_answer')->where('dt_id',$id)->delete();
-        //点赞，
+
+        //点赞
         Db::name('topic_dongtai_good')->where('dt_id',$id)->delete();
-        //评论点赞
-        Db::name('topic_answer_good')->where('dt_id',$id)->delete();
+
 
         Db::commit();
         $this->success('删除成功');
 
     }
 
-
-
     //某个圈子里的动态列表，关注，最新，附近
     public function topic_list(){
         $where = [
-            'dt.is_public' => 1,
             'dt.auditstatus' => 1,
         ];
 
-        //话题
-        $topic_id = input('topic_id',0);
-        $where_exp = [];
-        if($topic_id){
-            $where_exp[] = ['exp',Db::raw("FIND_IN_SET('".$topic_id."',dt.topic_ids)")];
-        }
         //最新
         $order = input('orderby','new');
-        $orderby  = 'dt.toptime desc,dt.id desc';
+        $orderby  = 'dt.id desc';
+
         //关注
         $where_follow = '';
         if($order == 'follow'){
@@ -237,26 +176,6 @@ class Topicdongtai extends Api
             if(!empty($follow_user_ids)){
                 $where_follow .= '(dt.user_id IN ('.implode(',',$follow_user_ids).'))';
             }
-            //关注的话题
-            $where_topic = "";
-            $follow_topic_ids= Db::name('user_follow_topic')->where(['uid'=>$this->auth->id])->column('topic_id');
-            if(!empty($follow_topic_ids)){
-                if(!empty($follow_user_ids)){
-                    $where_follow .= ' or ';
-                }
-
-                $where_topic .= "(";
-                foreach($follow_topic_ids as $ck => $cv){
-                    $where_topic .= "FIND_IN_SET('".$cv."',dt.topic_ids)";
-
-                    if($ck+1 < count($follow_topic_ids)){
-                        $where_topic .= " or ";
-                    }
-                }
-                $where_topic .= ")";
-
-                $where_follow .= $where_topic;
-            }
 
             //默认
             if($where_follow == ''){
@@ -265,34 +184,8 @@ class Topicdongtai extends Api
         }
 
 
-        //附近，根据距离排序
-        $having_dis = '';
-        if($order == 'near'){
-//            $where['dt.provincename'] = $this->auth->provincename;
-            $having_dis = 'distance < ' . 100000; //100公里范围
-            $orderby  = 'dt.toptime desc,distance asc';
-        }
-
         //性别
-        $gender = input('gender','all');
-        if($gender != 'all'){
-            $where['user.gender'] = $gender;
-        }
-
-        //属性
-        $attribute = input('attribute','all');
-        if($attribute != 'all'){
-
-            if($attribute == 'EE'){
-                $where['user.attribute'] = ['IN',['EE','BOTH']];
-            }
-            if($attribute == 'ER'){
-                $where['user.attribute'] = ['IN',['ER','BOTH']];
-            }
-            if($attribute == 'BOTH'){
-                //$where['user.attribute'] = 'BOTH';
-            }
-        }
+        $where['user.gender'] = ['neq',$this->auth->gender];
 
         //排除黑名单的
         $where_black = [];
@@ -302,73 +195,33 @@ class Topicdongtai extends Api
         }
 
         //列表
-        $field = 'dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime';
-        if($order == 'near'){
-            $field .= ',(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(dt.longitude,dt.latitude))*111195) as distance';
-        }
+        $field = 'dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status';
+
         $list = Db::name('topic_dongtai')->alias('dt')
             ->join('user','dt.user_id = user.id','LEFT')
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
             ->field($field)
             ->where($where)
-            ->where($where_exp)
             ->where($where_follow)
             ->where($where_black);
-        if($order == 'near'){
-            $list = $list->having($having_dis);
-        }
+
         $list = $list->order($orderby)
             ->autopage()->select();
         $list = list_domain_image($list,['images','audio_file','avatar']);
 
         if(!empty($list)){
             foreach($list as $key => &$val){
-                //艾特
-                $val['aite'] = json_decode($val['aite'],true);
-
-                //距离
-                $val['distance'] = isset($val['distance']) ? $val['distance'] : 0;
-                $val['distance'] = bcdiv(intval($val['distance']),1000,1).'km';
-                if($this->auth->longitude == 0 || $val['longitude'] == 0){
-                    $val['distance'] = '未知';
-                }
-
 
                 //用户年龄
                 $val['age'] = birthtime_to_age($val['birthday']);
                 unset($val['birthday']);
 
-                //用户vip
-                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
-                unset($val['vip_endtime']);
-
                 //追加点赞
                 $val['isgood'] = $this->is_good($val['id'],$this->auth->id);
 
                 //时间
                 $val['createtime_text'] = get_last_time($val['createtime']);
 
-                //关注
-                $val['is_follow'] = $this->is_follow($this->auth->id,$val['user_id']);
-
-                //收藏
-                $val['is_collect'] = $this->is_collect($val['id'],$this->auth->id);
-
-                //拉黑
-                $val['is_black'] = $this->is_black($this->auth->id,$val['user_id']);
-
-                //层主评论数量
-                $val['answernumber'] = Db::name('topic_dongtai_answer')->where(['dt_id'=>$val['id'],'level'=>1])->count();
-
-                //话题
-                $ids_str = $val['topic_ids'];
-                if($ids_str){
-                    $val['topic_text'] = Db::name('topic_hub')->where('id','IN',$val['topic_ids'])->orderRaw('field(id,'.$ids_str.')')->column('name');
-                }else{
-                    $val['topic_text'] = [];
-                }
-                //艾特了谁
-//                $val['aite_user'] = Db::name('user')->where('id','IN',$val['aite'])->column('nickname');
             }
         }
 
@@ -388,41 +241,16 @@ class Topicdongtai extends Api
 
         if($info){
 
-            $info['aite'] = json_decode($info['aite'],true);
-
             //用户年龄
             $info['age'] = birthtime_to_age($info['birthday']);
             unset($info['birthday']);
 
-            //用户vip
-            $info['is_vip'] = $info['vip_endtime'] > time() ? 1 : 0;
-            unset($info['vip_endtime']);
-
             //是否点赞过
             $info['isgood'] = $this->is_good($id,$this->auth->id);
 
             //时间
             $info['createtime_text'] = get_last_time($info['createtime']);
 
-            //关注
-            $info['is_follow'] = $this->is_follow($this->auth->id,$info['user_id']);
-
-            //收藏
-            $info['is_collect'] = $this->is_collect($id,$this->auth->id);
-
-            //拉黑
-            $info['is_black'] = $this->is_black($this->auth->id,$info['user_id']);
-
-            //层主评论数量
-            $info['answernumber'] = Db::name('topic_dongtai_answer')->where(['dt_id'=>$id,'level'=>1])->count();
-
-            //话题
-            $ids_str = $info['topic_ids'];
-            if($ids_str){
-                $info['topic_text'] = Db::name('topic_hub')->where('id','IN',$ids_str)->orderRaw('field(id,'.$ids_str.')')->column('name');
-            }else{
-                $info['topic_text'] = [];
-            }
         }else{
             $this->error('此动态已被删除');
         }
@@ -471,127 +299,6 @@ class Topicdongtai extends Api
         }
     }
 
-    //评论
-    public function answer(){
-        $id = input('id',0);
-        $content = input('content','');
-        $to_user_id = input('to_user_id',0);
-        $level = input('level',1);  //回复类型:1=层主回复楼主,2=层中回复
-        $floor = input('floor',0);
-
-        if(empty($content) || empty($id)){
-            $this->error();
-        }
-
-        //关键字替换
-        $content = Keyworld::sensitive($content);
-
-        //判断
-        if($level == 2 && $floor == 0){
-            $this->error('楼层错误');
-        }
-
-        //回复楼主，最新楼层
-        if($level == 1 || $floor == 0){
-            $to_user_id = 0;
-            $floor = 1;  //默认一楼
-
-            $last_floor = Db::name('topic_dongtai_answer')->where(['dt_id'=>$id,'level'=>1])->order('floor desc')->value('floor');
-            if($last_floor){
-                $floor = $last_floor + 1;
-            }
-        }
-
-        //判断user_id
-        if($to_user_id){
-            $to_user = Db::name('user')->where('id',$to_user_id)->value('id');
-            if(empty($to_user)){
-                $this->error('被回复的用户不存在');
-            }
-        }
-
-        //data
-        $data = [
-            'dt_id' => $id,
-            'floor' => $floor,
-            'user_id' => $this->auth->id,
-            'content' => $content,
-            'to_user_id' => $to_user_id,
-            'level' => $level,
-            'createtime' => time(),
-            'updatetime' => time(),
-        ];
-
-        Db::startTrans();
-        $rs = Db::name('topic_dongtai_answer')->insertGetId($data);
-
-        Db::name('topic_dongtai')->where('id',$id)->setInc('answernum');
-
-        //系统消息
-        if($level == 1){
-            //发给动态用户
-            $msg_user_id = Db::name('topic_dongtai')->where('id',$id)->value('user_id');
-            $msg_title = '动态评论';
-            $msg_content = $this->auth->nickname.'评论了你的动态';
-            $infotype_id = $rs;
-        }else{
-            //发给层主
-            $answer_info = Db::name('topic_dongtai_answer')->where(['dt_id'=>$id,'level'=>1,'floor'=>$floor])->find();
-            $msg_user_id = $answer_info['user_id'];
-            $msg_title = '动态评论点评';
-            $msg_content = $this->auth->nickname.'点评了你的动态评论';
-            $infotype_id = $answer_info['id'];
-        }
-        $msg_id = \app\common\model\Message::addMessage($msg_user_id,$msg_title,$msg_content,'dongtai_answer',$infotype_id);
-
-        Db::commit();
-        $this->success('评论成功');
-    }
-
-    //对评论点赞
-    public function answer_good(){
-        $dt_id = input('dt_id',0);
-        $answer_id = input('answer_id',0);
-
-        $where = [
-            'dt_id'     => $dt_id,
-            'answer_id' => $answer_id,
-            'user_id'   => $this->auth->id,
-        ];
-        $check = Db::name('topic_answer_good')->where($where)->find();
-
-        if($check){
-            Db::name('topic_answer_good')->where($where)->delete();
-            Db::name('topic_dongtai_answer')->where('id',$answer_id)->setDec('goodnum');
-            $this->success('已取消点赞');
-        }else{
-
-            Db::startTrans();
-            $where['createtime'] = time();
-            $rs = Db::name('topic_answer_good')->insertGetId($where);
-            $up = Db::name('topic_dongtai_answer')->where('id',$answer_id)->setInc('goodnum');
-
-            if($rs && $up !== false){
-                Db::commit();
-                $this->success('点赞成功');
-            }
-            Db::rollback();
-            $this->error('点赞失败');
-        }
-    }
-
-    //举报枚举
-    /*public function report_enum(){
-        $arr = [
-            '侮辱谩骂',
-            '色情低俗',
-            '政治敏感',
-            '违法违规',
-            '其他',
-        ];
-        $this->success(1,$arr);
-    }*/
-
     //举报
     public function report(){
         $dt_id = input('dt_id',0);
@@ -610,195 +317,6 @@ class Topicdongtai extends Api
         $this->success('举报成功');
     }
 
-    //收藏,取消收藏
-    public function collect(){
-        $where = [
-            'user_id'  => $this->auth->id,
-            'table'    => 'topic_dongtai',
-            'table_id' => input('id',0),
-        ];
-        $check = Db::name('user_collect')->where($where)->find();
-        if($check){
-            Db::name('user_collect')->where($where)->delete();
-            $this->success('已取消收藏');
-        }else{
-            Db::name('user_collect')->insertGetId($where);
-            $this->success('收藏成功');
-        }
-    }
-
-    //我的收藏
-    public function my_collect(){
-
-        $collect_id = Db::name('user_collect')->where(['table'=>'topic_dongtai','user_id'=>$this->auth->id])->column('table_id');
-
-        $where = ['dt.id'=>['IN',$collect_id]];
-
-        $list = Db::name('topic_dongtai')->alias('dt')
-            ->join('user','dt.user_id = user.id','LEFT')
-            ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
-            ->where($where)
-            ->order('dt.id desc')->autopage()->select();
-        $list = list_domain_image($list,['images','audio_file','avatar']);
-
-        if(!empty($list)){
-            foreach($list as $key => &$val){
-
-                $val['aite'] = json_decode($val['aite'],true);
-
-                //用户年龄
-                $val['age'] = birthtime_to_age($val['birthday']);
-                unset($val['birthday']);
-
-                //用户vip
-                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
-                unset($val['vip_endtime']);
-
-                //追加点赞
-                $val['isgood'] = $this->is_good($val['id'],$this->auth->id);
-
-                //时间
-                $val['createtime_text'] = get_last_time($val['createtime']);
-
-                //关注
-                $val['is_follow'] = $this->is_follow($this->auth->id,$val['user_id']);
-
-                //收藏
-                $val['is_collect'] = $this->is_collect($val['id'],$this->auth->id);
-
-                //拉黑
-                $val['is_black'] = $this->is_black($this->auth->id,$val['user_id']);
-
-                //层主评论数量
-                $val['answernumber'] = Db::name('topic_dongtai_answer')->where(['dt_id'=>$val['id'],'level'=>1])->count();
-
-                //话题
-                $ids_str = $val['topic_ids'];
-                if($ids_str){
-                    $val['topic_text'] = Db::name('topic_hub')->where('id','IN',$val['topic_ids'])->orderRaw('field(id,'.$ids_str.')')->column('name');
-                }else{
-                    $val['topic_text'] = [];
-                }
-            }
-        }
-
-        $this->success('success',$list);
-    }
-
-
-    //不感兴趣，屏蔽某条
-    /*public function screen(){
-        $data = [
-            'user_id' => $this->auth->id,
-            'dt_id'   => input('dt_id',0),
-        ];
-        $check = Db::name('topic_dongtai_screen')->where($data)->find();
-        if($check){
-            $this->success('操作成功');
-        }
-
-        Db::name('topic_dongtai_screen')->insertGetId($data);
-
-        $this->success('操作成功');
-    }*/
-
-    //评论列表
-    public function answer_list(){
-        $dt_id = input('dt_id',0);
-        //楼
-        $floor_list = Db::name('topic_dongtai_answer')
-            ->alias('a')
-            ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status')
-            ->join('user','a.user_id = user.id','LEFT')
-            ->where(['a.dt_id'=>$dt_id,'a.level'=>1])->order('a.id desc')->autopage()->select();
-        $floor_list = list_domain_image($floor_list,['avatar']);
-
-        //追加子评论
-        if(!empty($floor_list)){
-            foreach($floor_list as $key => &$val){
-                //下面几条子回复，字符串
-                $val['childremark'] = '';
-
-                $map = [
-                    'a.dt_id' => $dt_id,
-                    'a.floor' => $val['floor'],
-                    'a.level' => 2,
-                ];
-                $number = Db::name('topic_dongtai_answer')->alias('a')->where($map)->count();
-                if($number > 0){
-                    $answer_info = Db::name('topic_dongtai_answer')
-                        ->alias('a')
-                        ->field('user.nickname')
-                        ->join('user','a.user_id = user.id','LEFT')
-                        ->where($map)->order('a.id desc')->find();
-
-                    $val['childremark'] = $answer_info['nickname'].'...等人,共'.$number.'条回复';
-                }
-
-                //时间处理
-                $val['createtime_text'] = get_last_time($val['createtime']);
-
-                //回复是否已赞
-                $val['is_good'] = $this->answer_is_good($val['id'],$this->auth->id);
-
-                //用户年龄
-                $val['age'] = birthtime_to_age($val['birthday']);
-                unset($val['birthday']);
-            }
-        }
-
-        $this->success(1,$floor_list);
-    }
-
-    //单独某一层的详细
-    public function answer_info(){
-        $answer_id = input('answer_id');
-
-        //楼
-        $floor_info = Db::name('topic_dongtai_answer')
-            ->alias('a')
-            ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status')
-            ->join('user','a.user_id = user.id','LEFT')
-            ->where(['a.id'=>$answer_id])->find();
-        if(empty($floor_info)){
-            $this->success(1,[]);
-        }
-        $floor_info = info_domain_image($floor_info,['avatar']);
-        $floor_info['createtime_text'] = get_last_time($floor_info['createtime']);
-        //用户年龄
-        $floor_info['age'] = birthtime_to_age($floor_info['birthday']);
-        unset($floor_info['birthday']);
-        //回复是否已赞
-        $floor_info['is_good'] = $this->answer_is_good($answer_id,$this->auth->id);
-        $floor_info['answernumber'] = Db::name('topic_dongtai_answer')->where(['dt_id'=>$floor_info['dt_id'],'floor'=>$floor_info['floor'],'level'=>2])->count();
-
-        //层
-        $floors = $floor_info['floor'];
-        $child_lists = Db::name('topic_dongtai_answer')->alias('a')
-            ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status')
-            ->join('user','a.user_id = user.id','LEFT')
-            ->where(['a.dt_id'=>$floor_info['dt_id'],'a.floor'=>$floors,'a.level'=>2])->order('a.id desc')->autopage()->select();
-        $child_lists = list_domain_image($child_lists,['avatar','to_avatar']);
-        if(!empty($child_lists)){
-            foreach($child_lists as $key => &$answer){
-                //用户年龄
-                $answer['age'] = birthtime_to_age($answer['birthday']);
-                unset($answer['birthday']);
-
-                $answer['is_good'] = $this->answer_is_good($answer['id'],$this->auth->id);
-                $answer['createtime_text'] = get_last_time($answer['createtime']);
-            }
-        }
-
-        //合并
-        $floor_info['child'] = $child_lists;
-
-        $this->success('success',$floor_info);
-
-    }
-
-
     //是否点赞
     private function is_good($dt_id,$uid){
         $where = [
@@ -812,118 +330,6 @@ class Topicdongtai extends Api
             return 0;
         }
     }
-    //回复是否点赞
-    private function answer_is_good($answer_id,$uid){
-        $where = [
-            'answer_id' => $answer_id,
-            'user_id'  => $uid,
-        ];
-        $check = Db::name('topic_answer_good')->where($where)->find();
-        if($check){
-            return 1;
-        }else{
-            return 0;
-        }
-    }
-
-    //动态是否收藏
-    private function is_collect($dt_id,$uid){
-        $where = [
-            'user_id'  => $uid,
-            'table'    => 'topic_dongtai',
-            'table_id' => $dt_id,
-        ];
-        $check = Db::name('user_collect')->where($where)->find();
-        if($check){
-            return 1;
-        }else{
-            return 0;
-        }
-    }
-
-    //用户是否拉黑
-    private function is_black($uid,$black_uid){
-        $where = [
-            'uid'       => $uid,
-            'black_uid' => $black_uid,
-        ];
-        $check = Db::name('user_black')->where($where)->find();
-        if($check){
-            return 1;
-        }else{
-            return 0;
-        }
-    }
-
-
-    //我的评论
-    public function my_answer(){
-        $map = [
-            'a.user_id' => $this->auth->id,
-            'a.level'    => 1,
-        ];
-        $list = Db::name('topic_dongtai_answer')->alias('a')
-            ->field('a.id,a.createtime,a.content,a.dt_id,
-            dt.images,dt.content as dt_content,dt.type as dt_type,dtuser.nickname as dtuser_nickname,dtuser.username as dtuser_username,user.username,
-            user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
-            ->join('topic_dongtai dt','a.dt_id = dt.id','LEFT')
-            ->join('user dtuser','dt.user_id = dtuser.id','LEFT')
-            ->join('user user','a.user_id = user.id','LEFT')
-            ->join('user_wallet uw','user.id = uw.user_id','LEFT')
-            ->where($map)->order('a.id desc')->autopage()->select();
-        $list = list_domain_image($list,['avatar']);
-        if(!empty($list)){
-            foreach($list as $key => &$val){
-
-                //用户年龄
-                $val['age'] = birthtime_to_age($val['birthday']);
-                unset($val['birthday']);
-
-                //用户vip
-                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
-                unset($val['vip_endtime']);
-
-            }
-        }
-
-        $this->success(1,$list);
-    }
-
-    //删除我的某个评论
-    public function delete_answer(){
-        $id = input('id',0);
-        if(!$id){
-            $this->error();
-        }
-
-        Db::startTrans();
-        $info = Db::name('topic_dongtai_answer')->where('id',$id)->where('user_id',$this->auth->id)->find();
-        if(!$info){
-            $this->error('不存在的动态评论');
-        }
-
-        if($info['level'] == 1){
-
-
-            //楼层内都删
-            $louceng_id = Db::name('topic_dongtai_answer')->where('dt_id',$info['dt_id'])->where('level',2)->where('floor',$info['floor'])->column('id');
-            if(!empty($louceng_id)){
-                Db::name('topic_dongtai')->where('id',$info['dt_id'])->setDec('answernum',count($louceng_id));//回复数减1
-                Db::name('topic_dongtai_answer')->where('id','IN',$louceng_id)->delete();//评论删掉
-                Db::name('topic_answer_good')->where('answer_id','IN',$louceng_id)->delete();//评论点赞删掉
-            }
-
-        }
-
-        Db::name('topic_dongtai')->where('id',$info['dt_id'])->setDec('answernum');//回复数减1
-        Db::name('topic_dongtai_answer')->where('id',$id)->delete();  //评论删掉
-        Db::name('topic_answer_good')->where('answer_id',$id)->delete();//评论点赞删掉
-
-        Db::commit();
-
-        $this->success();
-    }
-
 
     //我点赞的动态
     public function my_good(){
@@ -934,50 +340,25 @@ class Topicdongtai extends Api
 
         $list = Db::name('topic_dongtai')->alias('dt')
             ->join('user','dt.user_id = user.id','LEFT')
-            ->join('user_wallet uw','user.id = uw.user_id','LEFT')
             ->join('topic_dongtai_good good','dt.id = good.dt_id','LEFT')
-            ->field('dt.*,dt.id as dt_id,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,user.idcard_status,uw.vip_endtime')
+            ->field('dt.*,dt.id as dt_id,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status')
             ->where($where)
             ->order('dt.id desc')->autopage()->select();
         $list = list_domain_image($list,['images','audio_file','avatar']);
 
         if(!empty($list)){
             foreach($list as $key => &$val){
-                $val['aite'] = json_decode($val['aite'],true);
 
                 //用户年龄
                 $val['age'] = birthtime_to_age($val['birthday']);
                 unset($val['birthday']);
 
-                //用户vip
-                $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
-                unset($val['vip_endtime']);
-
                 //追加点赞
                 $val['isgood'] = $this->is_good($val['id'],$this->auth->id);
 
                 //时间
                 $val['createtime_text'] = get_last_time($val['createtime']);
 
-                //关注
-                $val['is_follow'] = $this->is_follow($this->auth->id,$val['user_id']);
-
-                //收藏
-                $val['is_collect'] = $this->is_collect($val['id'],$this->auth->id);
-
-                //拉黑
-                $val['is_black'] = $this->is_black($this->auth->id,$val['user_id']);
-
-                //层主评论数量
-                $val['answernumber'] = Db::name('topic_dongtai_answer')->where(['dt_id'=>$val['id'],'level'=>1])->count();
-
-                //话题
-                $ids_str = $val['topic_ids'];
-                if($ids_str){
-                    $val['topic_text'] = Db::name('topic_hub')->where('id','IN',$val['topic_ids'])->orderRaw('field(id,'.$ids_str.')')->column('name');
-                }else{
-                    $val['topic_text'] = [];
-                }
             }
         }
 

application/common/controller/Api.php

@@ -512,6 +512,20 @@ class Api
         return 0;
     }
 
+    //用户是否拉黑
+    protected function is_black($uid,$black_uid){
+        $where = [
+            'uid'       => $uid,
+            'black_uid' => $black_uid,
+        ];
+        $check = db('user_black')->where($where)->find();
+        if($check){
+            return 1;
+        }else{
+            return 0;
+        }
+    }
+
     //实名认证限制功能
     //true  不需要实名认证，不受限
     //false 需要实名认证，受限