From b7e4f8e4609934ca972f8db5cbe41377e7c61e7d Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 2 Jul 2024 20:59:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E3=80=91MALL=EF=BC=9Areview=20=E5=AE=A2=E6=9C=8D=E7=9A=84?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/kefu/KeFuConversationController.java | 6 ++---- .../controller/admin/kefu/KeFuMessageController.java | 5 ++--- .../admin/kefu/vo/message/KeFuMessageSendReqVO.java | 4 ++-- .../promotion/dal/mysql/kefu/KeFuConversationMapper.java | 2 +- .../promotion/service/kefu/KeFuConversationService.java | 2 +- .../promotion/service/kefu/KeFuConversationServiceImpl.java | 4 ++-- .../promotion/service/kefu/KeFuMessageServiceImpl.java | 5 ++--- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuConversationController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuConversationController.java index 3d1d10db5..705118142 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuConversationController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuConversationController.java @@ -61,10 +61,8 @@ public class KeFuConversationController { // 拼接数据 Map userMap = memberUserApi.getUserMap(convertSet(respList, KeFuConversationRespVO::getUserId)); - respList.forEach(item->{ - findAndThen(userMap, item.getUserId(), memberUser-> item.setUserAvatar(memberUser.getAvatar()) - .setUserNickname(memberUser.getNickname())); - }); + respList.forEach(item-> findAndThen(userMap, item.getUserId(), + memberUser-> item.setUserAvatar(memberUser.getAvatar()).setUserNickname(memberUser.getNickname()))); return success(respList); } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java index 4cbc296b6..72ca7b066 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java @@ -67,9 +67,8 @@ public class KeFuMessageController { PageResult result = BeanUtils.toBean(pageResult, KeFuMessageRespVO.class); Map userMap = adminUserApi.getUserMap(convertSet(filterList(result.getList(), item -> UserTypeEnum.ADMIN.getValue().equals(item.getSenderType())), KeFuMessageRespVO::getSenderId)); - result.getList().forEach(item->{ - findAndThen(userMap, item.getSenderId(), adminUser -> item.setSenderAvatar(adminUser.getAvatar())); - }); + result.getList().forEach(item-> findAndThen(userMap, item.getSenderId(), + user -> item.setSenderAvatar(user.getAvatar()))); return success(result); } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessageSendReqVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessageSendReqVO.java index 3247a655e..fb4e1a26d 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessageSendReqVO.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessageSendReqVO.java @@ -23,9 +23,9 @@ public class KeFuMessageSendReqVO { // ========== 后端设置的参数，前端无需传递 ========== - @Schema(description = "发送人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24571", hidden = true) + @Schema(description = "发送人编号", example = "24571", hidden = true) private Long senderId; - @Schema(description = "发送人类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1", hidden = true) + @Schema(description = "发送人类型", example = "1", hidden = true) private Integer senderType; } \ No newline at end of file diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/kefu/KeFuConversationMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/kefu/KeFuConversationMapper.java index 35a664e53..40efa44a5 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/kefu/KeFuConversationMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/kefu/KeFuConversationMapper.java @@ -28,7 +28,7 @@ public interface KeFuConversationMapper extends BaseMapperX .setSql("admin_unread_message_count = admin_unread_message_count + 1")); } - default KeFuConversationDO selectByUserId(Long userId){ + default KeFuConversationDO selectByUserId(Long userId) { return selectOne(KeFuConversationDO::getUserId, userId); } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationService.java index 04b39769b..2da8d0bc6 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationService.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationService.java @@ -39,7 +39,7 @@ public interface KeFuConversationService { * * @param id 编号 */ - void updateAdminUnreadMessageCountWithZero(Long id); + void updateAdminUnreadMessageCountToZero(Long id); /** * 【管理员】更新会话对于管理员是否可见 diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationServiceImpl.java index 7ad6427ed..57df13d76 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationServiceImpl.java @@ -65,10 +65,10 @@ public class KeFuConversationServiceImpl implements KeFuConversationService { } @Override - public void updateAdminUnreadMessageCountWithZero(Long id) { + public void updateAdminUnreadMessageCountToZero(Long id) { // 校验存在 validateKefuConversationExists(id); - + // 管理员未读消息数归零 conversationMapper.updateById(new KeFuConversationDO().setId(id).setAdminUnreadMessageCount(0)); } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java index 45d49041e..e11474f91 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java @@ -96,9 +96,8 @@ public class KeFuMessageServiceImpl implements KeFuMessageService { if (UserTypeEnum.MEMBER.getValue().equals(userType) && ObjUtil.notEqual(conversation.getUserId(), userId)) { throw exception(KEFU_CONVERSATION_NOT_EXISTS); } - // 1.2 查询会话所有的未读消息 (tips: 多个客服，一个人点了，就都点了) + // 1.3 查询会话所有的未读消息 (tips: 多个客服，一个人点了，就都点了) List messageList = keFuMessageMapper.selectListByConversationIdAndReadStatus(conversationId, Boolean.FALSE); - // 1.3 情况一：没有未读消息 if (CollUtil.isEmpty(messageList)) { return; } @@ -107,7 +106,7 @@ public class KeFuMessageServiceImpl implements KeFuMessageService { keFuMessageMapper.updateReadStatusBatchByIds(convertSet(messageList, KeFuMessageDO::getId), new KeFuMessageDO().setReadStatus(Boolean.TRUE)); // 2.2 将管理员未读消息计数更新为零 - conversationService.updateAdminUnreadMessageCountWithZero(conversationId); + conversationService.updateAdminUnreadMessageCountToZero(conversationId); // 2.3 发送消息通知会员，管理员已读 -> 会员更新发送的消息状态 // TODO @puhui999：待定~