主页完善信息

application/api/controller/Gift.php

@@ -39,17 +39,18 @@ class Gift extends Api
      * 获取我的礼物墙
      */
     public function getMyGiftWall() {
-        $user_id = $this->request->request("user_id", 0);
+        $user_id = input("user_id", 0);
 
         $userid = $user_id ? $user_id : $this->auth->id;
 
         $list = Db::name('gift_user_typing')->alias('log')
-            ->join('gift', 'gift.id = log.gift_id', 'LEFT')->field('log.*,sum(number) as number,gift.image')
+            ->join('gift', 'gift.id = log.gift_id', 'LEFT')
+            ->field('log.id,log.gift_name,sum(log.number) as number,gift.image')
             ->where(['log.user_to_id' => $userid])
             ->group('log.gift_id')
             ->order('gift.price desc')
             ->select();
-        $list = list_domain_image($list,['image','special']);
+        $list = list_domain_image($list,['image']);
         $this->success("获取成功！", $list);
     }
 

application/api/controller/Usercenter.php

@@ -46,7 +46,6 @@ class Usercenter extends Api
 
         'open_match_video',
         'open_match_audio',
-        'open_match_typing',
         'match_video_price',
         'match_audio_price',
         'match_typing_price',
@@ -79,6 +78,10 @@ class Usercenter extends Api
         //枚举
         $userinfo['tag']   = Db::name('enum_tag')->where('id','IN',$userinfo['tag_ids'])->field(['id','name'])->select();
         $userinfo['hobby'] = Db::name('enum_hobby')->where('id','IN',$userinfo['hobby_ids'])->field(['id','name'])->select();
+        $userinfo['marital'] = Db::name('enum_marital')->where('id',$userinfo['marital_id'])->value('name');
+        $userinfo['suqiu'] = Db::name('enum_suqiu')->where('id',$userinfo['suqiu_id'])->value('name');
+        $userinfo['job'] = Db::name('enum_job')->where('id',$userinfo['job_id'])->value('name');
+        $userinfo['wages'] = Db::name('enum_wages')->where('id',$userinfo['wages_id'])->value('name');
 
         //vip
         $userinfo['vip_endtime'] = Db::name('user_wallet')->where('user_id',$uid)->value('vip_endtime');
@@ -103,21 +106,35 @@ class Usercenter extends Api
         $userinfo['active_info'] = $this->user_activeinfo($uid);
 
         //用户权限
-        $userinfo['power'] = Db::name('user_power')->where('user_id',$uid)->find();
+        //$userinfo['power'] = Db::name('user_power')->where('user_id',$uid)->find();
 
         //vip如果开了隐私保护，需要隐藏距离
-        $weizhi = $this->user_power($userinfo['id'],'weizhi');
+        /*$weizhi = $this->user_power($userinfo['id'],'weizhi');
         if($weizhi == 1){
 //            $userinfo['cityname'] = '';
-        }
+        }*/
 
         //追加登录用户的头像
         $userinfo['my_avatar'] = localpath_to_netpath($this->auth->avatar);
+
         //此用户与我的亲密度 信息
+        //api/match/intimacylevel
 
         //最新一条动态
-        $last_dongtai = Db::name('topic_dongtai')->where('user_id',$uid)->where('type',1)->where('auditstatus',1)->order('id desc')->find();
+        $last_dongtai = Db::name('topic_dongtai')->field('content,images')->where('user_id',$uid)->where('type',1)->where('auditstatus',1)->order('id desc')->find();
         $last_dongtai = info_domain_image($last_dongtai,['images']);
+        $userinfo['last_dongtai'] = $last_dongtai;
+
+        //礼物墙
+        $gift_wall = Db::name('gift_user_typing')->alias('log')
+            ->join('gift', 'gift.id = log.gift_id', 'LEFT')
+            ->field('log.id,log.gift_name,sum(log.number) as number,gift.image')
+            ->where(['log.user_to_id' => $uid])
+            ->group('log.gift_id')
+            ->order('gift.price desc')
+            ->select();
+        $gift_wall = list_domain_image($gift_wall,['image']);
+        $userinfo['gift_wall'] = $gift_wall;
 
         $this->success('success',$userinfo);
     }
@@ -147,6 +164,10 @@ class Usercenter extends Api
         //枚举
         $userinfo['tag']   = Db::name('enum_tag')->where('id','IN',$userinfo['tag_ids'])->field(['id','name'])->select();
         $userinfo['hobby'] = Db::name('enum_hobby')->where('id','IN',$userinfo['hobby_ids'])->field(['id','name'])->select();
+        $userinfo['marital'] = Db::name('enum_marital')->where('id',$userinfo['marital_id'])->value('name');
+        $userinfo['suqiu'] = Db::name('enum_suqiu')->where('id',$userinfo['suqiu_id'])->value('name');
+        $userinfo['job'] = Db::name('enum_job')->where('id',$userinfo['job_id'])->value('name');
+        $userinfo['wages'] = Db::name('enum_wages')->where('id',$userinfo['wages_id'])->value('name');
 
         //vip
         $userinfo['vip_endtime'] = Db::name('user_wallet')->where('user_id',$uid)->value('vip_endtime');
@@ -187,22 +208,37 @@ class Usercenter extends Api
         $userinfo['active_info'] = $this->user_activeinfo($uid);
 
         //用户权限
-        $userinfo['power'] = Db::name('user_power')->where('user_id',$uid)->find();
+        //$userinfo['power'] = Db::name('user_power')->where('user_id',$uid)->find();
 
         //vip如果开了隐私保护，需要隐藏距离
-        $weizhi = $this->user_power($userinfo['id'],'weizhi');
+        /*$weizhi = $this->user_power($userinfo['id'],'weizhi');
         if($weizhi == 1){
 //            $userinfo['cityname'] = '';
-        }
+        }*/
 
         //追加登录用户的头像
         $userinfo['my_avatar'] = localpath_to_netpath($this->auth->avatar);
-        //此用户与我的亲密度 信息
-
-        $this->success('success',$userinfo);
 
+        //此用户与我的亲密度 信息
+        //api/match/intimacylevel
 
+        //最新一条动态
+        $last_dongtai = Db::name('topic_dongtai')->field('content,images')->where('user_id',$uid)->where('type',1)->where('auditstatus',1)->order('id desc')->find();
+        $last_dongtai = info_domain_image($last_dongtai,['images']);
+        $userinfo['last_dongtai'] = $last_dongtai;
+
+        //礼物墙
+        $gift_wall = Db::name('gift_user_typing')->alias('log')
+            ->join('gift', 'gift.id = log.gift_id', 'LEFT')
+            ->field('log.id,log.gift_name,sum(log.number) as number,gift.image')
+            ->where(['log.user_to_id' => $uid])
+            ->group('log.gift_id')
+            ->order('gift.price desc')
+            ->select();
+        $gift_wall = list_domain_image($gift_wall,['image']);
+        $userinfo['gift_wall'] = $gift_wall;
 
+        $this->success('success',$userinfo);
 
     }