昵称备注

application/api/controller/Relation.php

@@ -41,13 +41,18 @@ class Relation extends Api
 
         //此用户创建的
         $list = Db::name('user_relation')->alias('r')
-            ->field('r.id,r.relationname,r.price,r.to_uid,user.username,user.nickname,user.avatar,user.id as user_id')
+            ->field('r.id,r.relationname,r.price,r.to_uid,user.username,user.nickname,user.avatar,user.id as user_id,ur.nickname_remark')
             ->join('user','r.to_uid = user.id','LEFT')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
             ->where('r.uid',$userid)
             ->order('id desc')
             ->select();
         $list = list_domain_image($list,['avatar']);
 
+        foreach ($list as &$val) {
+            $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
+        }
+
         //别人的关系，此用户加入
        /* $list2 = Db::name('user_relation')->alias('r')
             ->field('r.id,r.relationname,r.price,r.to_uid,user.username,user.nickname,user.avatar,user.id as user_id')

application/api/controller/Topicdongtai.php

@@ -551,8 +551,9 @@ class Topicdongtai extends Api
         //楼
         $floor_info = Db::name('topic_dongtai_answer')
             ->alias('a')
-            ->field('a.*,user.nickname,user.avatar,user.gender,user.birthday')
+            ->field('a.*,user.nickname,user.avatar,user.gender,user.birthday,ur.nickname_remark')
             ->join('user','a.user_id = user.id','LEFT')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
             ->where(['a.id'=>$answer_id])->find();
         if(empty($floor_info)){
             $this->success('success',[]);
@@ -565,11 +566,13 @@ class Topicdongtai extends Api
         $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();
 
+        $floor_info['nickname'] = !empty($floor_info['nickname_remark']) ? $floor_info['nickname_remark'] : $floor_info['nickname'];
         //层
         $floors = $floor_info['floor'];
         $child_lists = Db::name('topic_dongtai_answer')->alias('a')
-            ->field('a.*,user.nickname,user.avatar,user.gender,user.birthday')
+            ->field('a.*,user.nickname,user.avatar,user.gender,user.birthday,ur.nickname_remark')
             ->join('user','a.user_id = user.id','LEFT')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->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)){
@@ -579,6 +582,8 @@ class Topicdongtai extends Api
 
                 $answer['is_good'] = $this->answer_is_good($answer['id'],$this->auth->id);
                 $answer['createtime'] = get_last_time($answer['createtime']);
+
+                $answer['nickname'] = !empty($answer['nickname_remark']) ? $answer['nickname_remark'] : $answer['nickname'];
             }
         }
 
@@ -810,11 +815,16 @@ class Topicdongtai extends Api
 
     //动态通知
     public function message(){
-        $list = Db::name('topic_dongtai_message')->alias('msg')->field('msg.*,user.avatar,user.nickname')
+        $list = Db::name('topic_dongtai_message')->alias('msg')->field('msg.*,user.avatar,user.nickname,ur.nickname_remark')
             ->join('user','msg.from_user_id = user.id','LEFT')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
             ->where('msg.user_id',$this->auth->id)->autopage()->select();
         $list = list_domain_image($list,['avatar']);
 
+        foreach ($list as &$val) {
+            $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
+        }
+
         $this->success('success',$list);
     }
 
@@ -889,8 +899,9 @@ 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('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
             ->join('topic_hub th','dt.topic_id = th.id','LEFT')
-            ->field('dt.*,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status,user.is_hideaddress,th.name,uw.vip_endtime')
+            ->field('dt.*,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status,user.is_hideaddress,th.name,uw.vip_endtime,ur.nickname_remark')
             ->where($where)
             ->order($orderby)->autopage()->select();
         $list = list_domain_image($list,['images','avatar']);
@@ -908,6 +919,8 @@ class Topicdongtai extends Api
 
 
             foreach ($list as &$val) {
+                $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
+
                 $val['name'] = $val['name'] ? : '';
                 $val['birthday'] = birthtime_to_age($val['birthday']);
                 $val['createtime'] = get_last_time($val['createtime']);

application/api/controller/Userblack.php

@@ -17,12 +17,17 @@ class Userblack extends Api
         $list = Db::name('user_black')
             ->alias('black')
             ->join('user','black.uid = user.id','LEFT')
-            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
+            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender,ur.nickname_remark')
             ->where('black.black_uid',$this->auth->id)->order('black.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
         $list = list_birthday_age($list);
 
+        foreach ($list as &$val) {
+            $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
+        }
+
         $this->success('success',$list);
     }
 
@@ -31,8 +36,9 @@ class Userblack extends Api
         $list = Db::name('user_black')
             ->alias('black')
             ->join('user','black.black_uid = user.id','LEFT')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
 //            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender')
-            ->field('black.createtime,user.id,user.nickname,user.avatar')
+            ->field('black.createtime,user.id,user.nickname,user.avatar,ur.nickname_remark')
             ->where('black.uid',$this->auth->id)->order('black.id desc')->autopage()->select();
 
         if (!$list) {
@@ -41,8 +47,9 @@ class Userblack extends Api
 
         $list = list_domain_image($list,['avatar']);
 //        $list = list_birthday_age($list);
-        foreach ($list as &$v) {
-            $v['createtime'] = date('Y-m-d H:i', $v['createtime']);
+        foreach ($list as &$val) {
+            $val['createtime'] = date('Y-m-d H:i', $val['createtime']);
+            $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
         }
 
         $this->success('success',$list);

application/api/controller/Usercenter.php

@@ -415,7 +415,8 @@ class Usercenter extends Api
         $list = Db::name('user_guard')
             ->alias('a')
             ->join('user','a.user_id = user.id','LEFT')
-            ->field('a.createtime,user.id,user.nickname,user.avatar,user.real_status')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
+            ->field('a.createtime,user.id,user.nickname,user.avatar,user.real_status,ur.nickname_remark')
             ->where('a.user_to_id',$user_id)->order('a.id desc')->autopage()->select();
 
         if (!$list) {
@@ -424,8 +425,9 @@ class Usercenter extends Api
 
         $list = list_domain_image($list,['avatar']);
         $time = time();
-        foreach ($list as &$v) {
-            $v['createtime'] = ceil(($time - $v['createtime']) / 86400);
+        foreach ($list as &$val) {
+            $val['createtime'] = ceil(($time - $val['createtime']) / 86400);
+            $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
         }
 
         $this->success('success',$list);
@@ -450,7 +452,8 @@ class Usercenter extends Api
         $list = Db::name('user_guard')
             ->alias('a')
             ->join('user',$join,'LEFT')
-            ->field('a.createtime,user.id,user.nickname,user.avatar,user.real_status')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
+            ->field('a.createtime,user.id,user.nickname,user.avatar,user.real_status,ur.nickname_remark')
             ->where($where)->order('a.id desc')->autopage()->select();
 
         if (!$list) {
@@ -459,8 +462,9 @@ class Usercenter extends Api
 
         $list = list_domain_image($list,['avatar']);
         $time = time();
-        foreach ($list as &$v) {
-            $v['createtime'] = ceil(($time - $v['createtime']) / 86400);
+        foreach ($list as &$val) {
+            $val['createtime'] = ceil(($time - $val['createtime']) / 86400);
+            $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
         }
 
         $this->success('success',$list);

application/api/controller/Userfollow.php

@@ -23,8 +23,9 @@ class Userfollow extends Api
         $list = Db::name('user_follow')
             ->alias('follow')
             ->join('user','follow.follow_uid = user.id','LEFT')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
             ->join('user_wallet uw','follow.follow_uid = uw.id','LEFT')
-            ->field('user.id,user.nickname,user.avatar,user.real_status,user.idcard_status,user.birthday,user.gender,follow.status,uw.vip_endtime')
+            ->field('user.id,user.nickname,user.avatar,user.real_status,user.idcard_status,user.birthday,user.gender,follow.status,uw.vip_endtime,ur.nickname_remark')
             ->where('follow.uid',$this->auth->id)->where($where)->order('follow.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
@@ -50,6 +51,7 @@ class Userfollow extends Api
                     $val['charm_level'] = '';
                 }*/
                 $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+                $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
             }
         }
 
@@ -63,7 +65,8 @@ class Userfollow extends Api
             ->alias('follow')
             ->join('user','follow.uid = user.id','LEFT')
             ->join('user_wallet uw','follow.follow_uid = uw.id','LEFT')
-            ->field('user.id,user.nickname,user.avatar,user.real_status,user.idcard_status,user.birthday,user.gender,follow.status,uw.vip_endtime')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
+            ->field('user.id,user.nickname,user.avatar,user.real_status,user.idcard_status,user.birthday,user.gender,follow.status,uw.vip_endtime,ur.nickname_remark')
             ->where('follow.follow_uid',$this->auth->id)->order('follow.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
@@ -89,6 +92,7 @@ class Userfollow extends Api
                     $val['charm_level'] = '';
                 }*/
                 $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+                $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
             }
         }
 

application/api/controller/Userlike.php

@@ -17,12 +17,17 @@ class Userlike extends Api
         $list = Db::name('user_like')
             ->alias('like')
             ->join('user','like.uid = user.id','LEFT')
-            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
+            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender,ur.nickname_remark')
             ->where('like.like_uid',$this->auth->id)->order('like.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
         $list = list_birthday_age($list);
 
+        foreach ($list as &$val) {
+            $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
+        }
+
         $this->success('success',$list);
     }
 
@@ -57,12 +62,17 @@ class Userlike extends Api
         $list = Db::name('user_like')
             ->alias('like')
             ->join('user','like.like_uid = user.id','LEFT')
-            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
+            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender,ur.nickname_remark')
             ->where('like.uid',$this->auth->id)->order('like.id desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
         $list = list_birthday_age($list);
 
+        foreach ($list as &$val) {
+            $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
+        }
+
         $this->success('success',$list);
     }
 

application/api/controller/Uservisit.php

@@ -18,12 +18,17 @@ class Uservisit extends Api
         $list = Db::name('user_visit')
             ->alias('visit')
             ->join('user','visit.to_uid = user.id','LEFT')
-            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
+            ->field('user.id,user.nickname,user.avatar,user.bio,user.birthday,user.gender,ur.nickname_remark')
             ->where('visit.uid',$this->auth->id)->order('visit.updatetime desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
         $list = list_birthday_age($list);
 
+        foreach ($list as &$val) {
+            $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
+        }
+
         $this->success('success',$list);
     }
 
@@ -40,7 +45,8 @@ class Uservisit extends Api
         $list = Db::name('user_visit')
             ->alias('visit')
             ->join('user','visit.uid = user.id','LEFT')
-            ->field('user.id,user.nickname,user.avatar,visit.updatetime')
+            ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
+            ->field('user.id,user.nickname,user.avatar,visit.updatetime,ur.nickname_remark')
             ->where('visit.to_uid',$this->auth->id)->order('visit.updatetime desc')->autopage()->select();
 
         $list = list_domain_image($list,['avatar']);
@@ -69,6 +75,9 @@ class Uservisit extends Api
                 $v['nickname'] = 'Ta偷偷来过';
                 $v['avatar'] = config('avatar_girl');
             }
+
+            $v['nickname'] = !empty($v['nickname_remark']) ? $v['nickname_remark'] : $v['nickname'];
+
         }
 
         $this->success('success',$list);