|
@@ -44,7 +44,7 @@ public class KfRoomMsgServiceImpl extends ServiceImpl<KfRoomMsgMapper, KfRoomMsg
|
|
Page<KfRoomMsg> kfRoomMsgPage = super.page(new Page<>(pageBean.getPageNum(), pageBean.getPageSize()),
|
|
Page<KfRoomMsg> kfRoomMsgPage = super.page(new Page<>(pageBean.getPageNum(), pageBean.getPageSize()),
|
|
new QueryWrapper<KfRoomMsg>().lambda()
|
|
new QueryWrapper<KfRoomMsg>().lambda()
|
|
.eq(KfRoomMsg::getRoomId, roomId)
|
|
.eq(KfRoomMsg::getRoomId, roomId)
|
|
- .orderByDesc(KfRoomMsg::getCreateTime)
|
|
|
|
|
|
+ .orderByDesc(KfRoomMsg::getSortTime)
|
|
);
|
|
);
|
|
//客服名字列表
|
|
//客服名字列表
|
|
Map<Long, String> kfUserNameMap = this.getKfUserNameMap(kfRoomMsgPage.getRecords());
|
|
Map<Long, String> kfUserNameMap = this.getKfUserNameMap(kfRoomMsgPage.getRecords());
|
|
@@ -103,6 +103,7 @@ public class KfRoomMsgServiceImpl extends ServiceImpl<KfRoomMsgMapper, KfRoomMsg
|
|
.msgOwner(KfRoomMsgOwnerEnum.KF_MSG_OWNER_KF.getValue())
|
|
.msgOwner(KfRoomMsgOwnerEnum.KF_MSG_OWNER_KF.getValue())
|
|
.content(JsonUtil.toString(BeanUtil.copy(msgContent, KfWebSocketMsgDTO.MsgContentBean.class)))
|
|
.content(JsonUtil.toString(BeanUtil.copy(msgContent, KfWebSocketMsgDTO.MsgContentBean.class)))
|
|
.source(JsonUtil.toString(msgContent))
|
|
.source(JsonUtil.toString(msgContent))
|
|
|
|
+ .sortTime(System.currentTimeMillis())
|
|
.createTime(LocalDateTime.now())
|
|
.createTime(LocalDateTime.now())
|
|
.updateTime(LocalDateTime.now())
|
|
.updateTime(LocalDateTime.now())
|
|
.build());
|
|
.build());
|