From 7945d7cc0ca174fad6389899db6a74e4116e7b59 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 21 Apr 2023 11:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E5=A4=B4=E5=83=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/api/controller/v2/user/StoreService.php | 5 ++++- crmeb/app/dao/service/StoreServiceLogDao.php | 2 +- crmeb/app/kefuapi/controller/Service.php | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crmeb/app/api/controller/v2/user/StoreService.php b/crmeb/app/api/controller/v2/user/StoreService.php index 9f5ce0ac7..e0d7ff852 100644 --- a/crmeb/app/api/controller/v2/user/StoreService.php +++ b/crmeb/app/api/controller/v2/user/StoreService.php @@ -40,8 +40,11 @@ class StoreService /** * 客服聊天记录 * @param Request $request - * @param $toUid + * @param StoreServiceServices $services * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function record(Request $request, StoreServiceServices $services) { diff --git a/crmeb/app/dao/service/StoreServiceLogDao.php b/crmeb/app/dao/service/StoreServiceLogDao.php index 010cd6919..6448ac5a1 100644 --- a/crmeb/app/dao/service/StoreServiceLogDao.php +++ b/crmeb/app/dao/service/StoreServiceLogDao.php @@ -83,7 +83,7 @@ class StoreServiceLogDao extends BaseDao $query->where('id', '<', $upperId)->limit($limit)->order('id DESC'); })->when(!$upperId, function ($query) use ($limit) { $query->limit($limit)->order('id DESC'); - })->with(['user', 'service'])->select()->toArray(); + })->with(['user'])->select()->toArray(); } /** diff --git a/crmeb/app/kefuapi/controller/Service.php b/crmeb/app/kefuapi/controller/Service.php index 643ec7e13..9975ff1ad 100644 --- a/crmeb/app/kefuapi/controller/Service.php +++ b/crmeb/app/kefuapi/controller/Service.php @@ -261,8 +261,11 @@ class Service extends AuthController /** * 聊天记录 - * @param $uid + * @param Request $request * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function getChatList(Request $request) {