Wesmiler OTC 提交更新 0729

app/Http/Controllers/Admin/ChatController.php

@@ -63,7 +63,7 @@ class ChatController extends Backend
         if($type == 2){
             $list = $this->service->getDataList($params, $pageSize);
         }else{
-            $list = $this->service->getWaitList($params, $pageSize);
+            $list = $this->service->getNewList($params, $pageSize);
         }
 
         $userId = $this->userInfo['user_type']==2? $this->userInfo['user_id'] : 1;

app/Services/ChatMessageService.php

@@ -277,7 +277,7 @@ class ChatMessageService extends BaseService
         $counts['message'] = (int) $this->model->where(['status'=>1,'mark'=>1,'type'=>1])
             ->where(function($query) use($userId){
                 $query->where(['to_uid'=> $userId]);
-            })->count('id');
+            })->groupBy('chat_key')->count('id');
 
         return $counts;
     }