增加好友备注渲染

Author: linyiyuan

app/Controller/Laboratory/FriendController.php

@@ -7,6 +7,7 @@
 use App\Controller\AbstractController;
 use App\Model\Auth\User;
 use App\Model\Laboratory\FriendChatHistory;
+use App\Model\Laboratory\FriendRelation;
 use Hyperf\HttpServer\Annotation\Controller;
 use Hyperf\HttpServer\Annotation\Middleware;
 use Hyperf\HttpServer\Annotation\Middlewares;
@@ -63,6 +64,12 @@ public function historyMessage()
         $list = [];
         foreach ($messageList as $key => $value) {
             $sendTime = intval($value['send_time'] / 1000);
+            //获取用户联系人
+            $user = User::query()->select('id', 'desc', 'avatar')->where('id', $value['from_uid'])->first();
+            $displayName = $user['desc'];
+            $friendRemark = FriendRelation::query()->where('uid', $value['to_uid'])->where('friend_id', $value['from_uid'])->value('friend_remark');
+            if (!empty($friendRemark) && $value['from_uid'] != $userInfo['id']) $displayName = $friendRemark;
+
             $list[] = [
                 'id' => $value['message_id'],
                 'status' => $value['status'],
@@ -72,8 +79,8 @@ public function historyMessage()
                 'fileExt' => $value['file_ext'],
                 'sendTime' => date('Y-m-d', $sendTime) == date('Y-m-d') ? date('H:i:s', $sendTime) : date('Y-m-d, H:i:s', $sendTime) ,
                 'content' => $value['content'],
-                'avatar' => User::query()->where('id', $value['from_uid'])->value('avatar'),
-                'displayName' => User::query()->where('id', $value['from_uid'])->value('desc'),
+                'avatar' => $user['avatar'],
+                'displayName' => $displayName,
             ];
         }
         return $this->success([

app/Controller/Laboratory/MessageController.php

@@ -9,6 +9,7 @@
 use App\Foundation\Facades\MessageParser;
 use App\Model\Auth\User;
 use App\Model\Laboratory\FriendChatHistory;
+use App\Model\Laboratory\FriendRelation;
 use App\Model\Laboratory\GroupChatHistory;
 use App\Pool\Redis;
 use App\Service\Laboratory\MessageService;
@@ -34,6 +35,8 @@ public function sendMessage()
 
         $contactId = Redis::getInstance()->hget(ChatRedisKey::ONLINE_USER_FD_KEY, (string)$contactData['toContactId']);
         $receptionState = empty($contactId) ? FriendChatHistory::RECEPTION_STATE_NO : FriendChatHistory::RECEPTION_STATE_YES;
+        if (!empty($name = FriendRelation::getFriendRemarkNameById($contactData['fromUser']['id'], $contactData['toContactId']))) $contactData['fromUser']['displayName'] = $name;
+
         //添加聊天记录
         FriendChatHistory::addMessage($contactData, $receptionState);
         $contactData['status'] = FriendChatHistory::FRIEND_CHAT_MESSAGE_STATUS_SUCCEED;
@@ -87,6 +90,12 @@ public function pullMessage()
 
         $list = [];
         foreach ($messageList as $key => $value) {
+            //获取用户联系人
+            $userInfo = User::query()->select('id', 'desc', 'avatar')->where('id', $value['from_uid'])->first();
+            $displayName = $userInfo['desc'];
+            $friendRemark = FriendRelation::query()->where('uid', $value['to_uid'])->where('friend_id', $value['from_uid'])->value('friend_remark');
+            if (!empty($friendRemark) && $value['from_uid'] != $contactData['user_id']) $displayName = $friendRemark;
+
             $temp = [
                 'id' => $value['message_id'],
                 'status' => $value['status'],
@@ -99,12 +108,13 @@ public function pullMessage()
                 'fileExt' => $value['file_ext'],
                 'isGroup' => false,
                 'fromUser' => [
-                    'id' => $value['from_uid'],
-                    'avatar' => User::query()->where('id', $value['from_uid'])->value('avatar'),
-                    'displayName' => User::query()->where('id', $value['from_uid'])->value('desc'),
+                    'id' => $userInfo['id'],
+                    'avatar' => $userInfo['avatar'] ?? '',
+                    'displayName' => $displayName,
                 ],
             ];
-            if ($temp['type'] == FriendChatHistory::FRIEND_CHAT_MESSAGE_TYPE_FORWARD) $temp['content'] = MessageService::getInstance()->formatForwardMessage($temp['content'], $temp['fromUser']);
+            if ($temp['type'] == FriendChatHistory::FRIEND_CHAT_MESSAGE_TYPE_FORWARD)
+                $temp['content'] = MessageService::getInstance()->formatForwardMessage($temp['content'], $temp['fromUser']);
             $list[] = $temp;
         }
         return [

app/Controller/Laboratory/Ws/FriendController.php

@@ -6,6 +6,13 @@
 
 use App\Model\Model;
 
+/**
+ * 好友关系表
+ * Class FriendRelation
+ * @package App\Model\Laboratory
+ * @Author YiYuan-Lin
+ * @Date: 2021/7/9
+ */
 class FriendRelation extends Model
 {
     /**
@@ -51,4 +58,17 @@ class FriendRelation extends Model
     public function getUser() {
         return $this->belongsTo('App\Model\Auth\User', 'friend_id', 'id');
     }
+
+    /**
+     * 获取好友关系的好友备注
+     * @param int 发送方 $fromUid
+     * @param int 接收方 $toUid
+     * @return \Hyperf\Utils\HigherOrderTapProxy|mixed|string|void
+     */
+    public static function getFriendRemarkNameById(int $fromUid, int $toUid)
+    {
+        if (empty($fromUid) || empty($toUid)) return '';
+
+        return static::query()->where('uid', $toUid)->where('friend_id', $fromUid)->value('friend_remark');
+    }
 }

app/Model/Laboratory/FriendRelation.php

@@ -130,16 +130,16 @@ private function getUnReadMessageByUser(array $user, array $currentUserInfo) : a
 
         $lastMessage = FriendChatHistory::query()
             ->where(function ($query) use ($currentUserInfo, $user) {
-                $query->where('from_uid', $currentUserInfo['id'])->where('to_uid', $user['id']);
+                $query->where('from_uid', $currentUserInfo['id'])->where('to_uid', $user['get_user']['id']);
             })->orWhere(function ($query) use ($currentUserInfo, $user) {
-                $query->where('from_uid', $user['id'])->where('to_uid', $currentUserInfo['id']);
+                $query->where('from_uid', $user['get_user']['id'])->where('to_uid', $currentUserInfo['id']);
             })
             ->orderBy('send_time', 'desc')
             ->first();
 
         $unread = FriendChatHistory::query()
             ->where(function ($query) use ($currentUserInfo, $user) {
-                $query->where('from_uid', $user['id'])->where('to_uid', $currentUserInfo['id'])
+                $query->where('from_uid', $user['get_user']['id'])->where('to_uid', $currentUserInfo['id'])
                     ->where('reception_state', FriendChatHistory::RECEPTION_STATE_NO);
             })
             ->orderBy('send_time', 'desc')