bug

application/chat/service/ChatService.php

@@ -217,7 +217,7 @@ class ChatService
         foreach ($info as $item) {
             array_push($target, $item["push_id"]);
         }
-        $rPush->send($user_name, $target_type, $target, $msg_content, $from, $type, $accessToken, [ $this, 'saveSendStatus' ]);
+        $rPush->send($user_name, $target_type, $target, $msg_content, $from,$is_user, $type, $accessToken, [ $this, 'saveSendStatus' ]);
         return true;
     }
 
@@ -230,14 +230,14 @@ class ChatService
      */
     public function saveSendStatus($response, $target, $from, $msg_content)
     {
-       /* $response = json_decode($response, true);
-        //目前没有针对多人聊天
-        $status       = isset($response["data"][$target[0]]) ? $response["data"][$target[0]] : "faild";
-        $error_reason = "";
-        if ($status != "success") {
-            $error_reason = "环信发送异常";
-        }
-        $this->insertPushLog($from, $target[0], $msg_content, $status, $error_reason);*/
+        /* $response = json_decode($response, true);
+         //目前没有针对多人聊天
+         $status       = isset($response["data"][$target[0]]) ? $response["data"][$target[0]] : "faild";
+         $error_reason = "";
+         if ($status != "success") {
+             $error_reason = "环信发送异常";
+         }
+         $this->insertPushLog($from, $target[0], $msg_content, $status, $error_reason);*/
     }
 
 
@@ -341,7 +341,7 @@ class ChatService
         $params["is_user"]      = $is_user;
         $params["created_at"]   = date("Y-m-d H:i:s", time());
         $params["updated_at"]   = date("Y-m-d H:i:s", time());
-       //dump($params);
+        //dump($params);
         $msgModel = new ChatMsg();
         $id       = $msgModel->addChatMsg($params);
 
@@ -377,11 +377,11 @@ class ChatService
         }
     }
 
-    /**
-     * 获取聊天列表
+
+    /**获取聊天列表
      * @param $target
-     * @return false|\PDOStatement|string|\think\Collection
-     * @throws \think\db\exception\DataNotFoundException
+     * @return array
+     * * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
@@ -394,15 +394,26 @@ class ChatService
         c.name as agent_name,c.img,d.user_name,d.user_phone,d.user_nick,d.user_pic,d.other_pic";
 
         $relationList = $chatRelationModel->getChatRelationInfo($params, $field);
+
+        $result = [];
         //dump($relationList);
-        $fields = "a.id,a.from_id,a.to_id,b.body,a.created_at";
+        $fields   = "a.id,a.from_id,a.to_id,b.body,a.created_at";
         $msgModel = new ChatMsg();
-        foreach ($relationList as $key=> $item) {
-            $select_["from"]   = $item["from_id"];
-            $select_["target"] = $item["to_id"];
-            $relationList[$key]["chat_info"] = $msgModel->getChatHistory($select_, $fields, 1, 1);
+        foreach ($relationList as $key => $item) {
+            if ($item["from_id"] == $target) {
+                $result[$key]["relation_id"] = $item["to_id"];
+            }else{
+                $result[$key]["relation_id"] = $item["from_id"];
+            }
+            $result[$key]["id"] = $item["id"];
+            $result[$key]["type"] = $item["type"];
+            $result[$key]["id"] = $item["id"];
+            $result[$key]["id"] = $item["id"];
+            $select_["from"]                 = $item["from_id"];
+            $select_["target"]               = $item["to_id"];
+            $result[$key]["chat_info"] = $msgModel->getChatHistory($select_, $fields, 1, 1);
         }
-        return $relationList;
+        return $result;
     }
 
     /**

application/chat/utils/RPush.php

@@ -24,11 +24,12 @@ class RPush
      * @param $target
      * @param $msg_content
      * @param $from
+     * @param $is_user
      * @param $type
      * @param $access_token
      * @param $callback
      */
-    public function send($user_name, $target_type, $target, $msg_content, $from, $type, $access_token, $callback)
+    public function send($user_name, $target_type, $target, $msg_content, $from, $is_user, $type, $access_token, $callback)
     {
         //todo
         if (Cache::get('save_message_num')) {
@@ -44,7 +45,7 @@ class RPush
             Cache::set('save_message_num', 0);
         }
 
-        $response = $this->sendRequestByCurl($user_name, $target_type, $target, $msg_content, $from, $type, $access_token);
+        $response = $this->sendRequestByCurl($user_name, $target_type, $target, $msg_content, $from, $is_user, $type, $access_token);
         call_user_func_array([ $callback[0], $callback[1] ], [ $response, $target, $from, $msg_content ]);
 
     }
@@ -61,10 +62,10 @@ class RPush
      * @param $access_token
      * @return array
      */
-    public function sendRequestByCurl($user_name, $target_type, $target, $msg_content, $from, $type, $access_token)
+    public function sendRequestByCurl($user_name, $target_type, $target, $msg_content, $from, $is_user, $type, $access_token)
     {
 
-        $title            = "收到一条消息";
+        $title = "收到一条消息";
 //        $arr              = array(
 //            'target_type' => $target_type,
 //            'target'      => $target,
@@ -74,24 +75,24 @@ class RPush
 //        );
 
         $payload = json_encode(array(
-            'title' => $title,
-            'content' => $msg_content,
-            'type' => 'chat',
-            'url' => '',
-            'name' => $title,
+            'title'    => $title,
+            'content'  => $msg_content,
+            'type'     => 'chat',
+            'url'      => '',
+            'name'     => $title,
             'imageUrl' => '',
-            'id'=>0,
+            'id'       => 0,
             'target'   => $target,
             'from'     => $from,
+            'is_user'  => $is_user,
             'msg_type' => 1,    // 1文本 2图片3楼盘
-            'ext'      => ["user_name" => $user_name ]
+            'ext'      => [ "user_name" => $user_name ]
         ));
 
         $pushMessageToIgt = new GeTuiUtils();
         $push_arr         = $target;
 
 
-
         return $pushMessageToIgt->pushMessageToIgt($push_arr, $title, $payload);
         /*  $curl          = new \app\chat\utils\CurlUtil();
           $curl->headers = [