wesmiler

app/Http/Controllers/Api/v1/MemberController.php

@@ -26,7 +26,7 @@ class MemberController extends webApp
     {
         $userId = request()->post('user_id', 0);
         $type = request()->post('type', 'detail');
-        $info = MemberService::make()->getInfo($userId? $userId : $this->userId, $type);
+        $info = MemberService::make()->getInfo($userId? $userId : $this->userId, $type,[], $this->userId);
         if($info){
             return message(1010, true, $info);
         }else{

app/Services/Api/MemberService.php

@@ -70,7 +70,7 @@ class MemberService extends BaseService
      * @param $where
      * @param array $field
      */
-    public function getInfo($where, $type = 'detail', array $field = [])
+    public function getInfo($where, $type = 'detail', array $field = [], $userId=0)
     {
         $defaultField = ['id', 'username','email', 'realname', 'mobile','gender','member_level', 'nickname', 'code','supper_point', 'parent_id','province_id','city_id','signature','power_num','trade_state','trc_url','recharge_trc_url', 'point_id', 'balance','trx','usdt','wait_score', 'score','pay_password','realname','idcard_check', 'member_level', 'status', 'avatar'];
         $withs = ['merchant','acceptor','parent','point','level'];
@@ -112,7 +112,7 @@ class MemberService extends BaseService
                 $info['fans'] = (int)MemberCollectService::make()->getCount($info['id'], 1,1); // 粉丝数量（被关注）
                 $info['follow'] = (int)MemberCollectService::make()->getCount($info['id'], 1,2); // 关注数量
                 $info['like_num'] = (int)VideoModel::where(['user_id'=>$info['id'],'mark'=>1])->sum('like_num'); // 点赞喜欢数量
-
+                $info['is_follow'] = (int)MemberCollectService::make()->checkCollect($userId, $info['id'],1); // 是否关注了
             }
 
             else if ($type == 'info') {

app/Services/Api/MessageService.php

@@ -162,8 +162,8 @@ class MessageService extends BaseService
         }
 
         $where = ['a.status' => 1, 'a.mark' => 1];
-        $field = ['a.id', 'a.msg_type','a.chat_key','a.live_id', 'a.description', 'a.message','b.nickname', 'a.from_uid', 'a.to_uid', 'a.create_time', 'a.status'];
-        $datas = LiveChatModel::from('live_chat as a')
+        $field = ['a.id', 'a.msg_type','a.chat_key','a.live_id', 'a.description', 'a.message','b.nickname', 'a.from_uid','b.avatar as from_user_avatar', 'a.to_uid', 'a.create_time', 'a.status'];
+        $datas = LiveChatModel::with(['member'])->from('live_chat as a')
             ->leftJoin('member as b', 'b.id', '=', 'a.from_uid')
             ->leftJoin('member as c', 'c.id', '=', 'a.to_uid')
             ->where($where)
@@ -191,6 +191,7 @@ class MessageService extends BaseService
         if ($datas) {
             foreach ($datas['data'] as &$item) {
                 $item['time_text'] = isset($item['create_time']) && $item['create_time'] ? dateForWeek($item['create_time']) : '';
+                $item['member']['avatar'] = $item['from_user_avatar']? get_image_url($item['from_user_avatar']) : '/images/member/logo.png';
             }
             unset($item);