合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !1733

@@ -26,6 +26,10 @@ class ChatController extends BaseController
      */
      */
     public function list(Chat $chat){
     public function list(Chat $chat){
         $list = $chat->lists(['user_id'=>$this->user['id'],'status'=>1],$this->page,$this->row);
         $list = $chat->lists(['user_id'=>$this->user['id'],'status'=>1],$this->page,$this->row);
+        $chatItem = new ChatItem();
+        foreach ($list as $k => $v){
+            $chatItem->orderBy('id', 'desc')->first();
+        }
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 
 

@@ -121,7 +121,9 @@ class ChatLogic extends BaseLogic
         //创建一个会话
         //创建一个会话
         $saveData = [
         $saveData = [
             'user_id'=>$this->user['id'],
             'user_id'=>$this->user['id'],
-            'input_content'=>$message,
+            'input_content'=>mb_substr($message, 0, 50, "UTF-8").'...',
+            'last_created_at'=>date('Y-m-d H:i:s'),
+            'last_input_content'=>mb_substr($message, 0, 50, "UTF-8").'...'
         ];
         ];
         return $this->model->addReturnId($saveData);
         return $this->model->addReturnId($saveData);
     }
     }
@@ -141,6 +143,9 @@ class ChatLogic extends BaseLogic
             'chat_id'=>$id,
             'chat_id'=>$id,
             'content'=>$message,
             'content'=>$message,
         ];
         ];
-        return $this->itemModel->addReturnId($saveData);
+        //同时更改主任务
+        $this->itemModel->addReturnId($saveData);
+        $data = ['last_created_at'=>date('Y-m-d H:i:s'),'last_input_content'=>mb_substr($message, 0, 50, "UTF-8")];
+        return $this->model->edit($data,['id'=>$id]);
     }
     }
 }
 }