diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
index 1bfdf517..05847d62 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Arrays;
+import java.util.Map;
 
 /**
  * <p>
@@ -51,6 +52,13 @@ public class PushChatMessageController {
         return R.ok(result.getRecords(), result.getTotal());
     }
 
+    @GetMapping("/listFriendHistoryMessage")
+    @ApiOperation(value = "分页好友历史记录查询")
+    public R listFriendHistoryMessage(Page page, PushChatMessage pushChatMessage) {
+        IPage<Map<String, Object>> result = iPushChatMessageService.listFriendHistoryMessage(page, pushChatMessage);
+        return R.ok(result.getRecords(), result.getTotal());
+    }
+
     @GetMapping("/{id:\\w+}")
     @ApiOperation(value = "根据id获取")
     public R getById(@PathVariable("id") String id) {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushChatMessageMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushChatMessageMapper.java
index d80a2339..aa455e8a 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushChatMessageMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushChatMessageMapper.java
@@ -1,7 +1,12 @@
 package com.cloud.kicc.commonbiz.mapper;
 
-import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PushChatMessageMapper extends BaseMapper<PushChatMessage> {
 
+    IPage<Map<String, Object>> listFriendHistoryMessage(Page page, @Param("ew") PushChatMessage pushChatMessage);
+
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushChatMessageService.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushChatMessageService.java
index 49d1df67..d5663fe4 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushChatMessageService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/IPushChatMessageService.java
@@ -1,7 +1,11 @@
 package com.cloud.kicc.commonbiz.service;
 
-import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +17,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IPushChatMessageService extends IService<PushChatMessage> {
 
+    IPage<Map<String, Object>> listFriendHistoryMessage(Page page, PushChatMessage pushChatMessage);
+
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushChatMessageServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushChatMessageServiceImpl.java
index 06ab4502..0a1aea91 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushChatMessageServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushChatMessageServiceImpl.java
@@ -1,11 +1,15 @@
 package com.cloud.kicc.commonbiz.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.commonbiz.api.entity.PushChatMessage;
 import com.cloud.kicc.commonbiz.mapper.PushChatMessageMapper;
 import com.cloud.kicc.commonbiz.service.IPushChatMessageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * <p>
  * 聊天消息表 服务实现类
@@ -17,4 +21,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class PushChatMessageServiceImpl extends ServiceImpl<PushChatMessageMapper, PushChatMessage> implements IPushChatMessageService {
 
+    @Override
+    public IPage<Map<String, Object>> listFriendHistoryMessage(Page page, PushChatMessage pushChatMessage) {
+        return baseMapper.listFriendHistoryMessage(page, pushChatMessage);
+    }
+
 }
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml
index 258c454b..622fbcc3 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml
@@ -2,4 +2,43 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cloud.kicc.commonbiz.mapper.PushChatMessageMapper">
 
+  <select id="listFriendHistoryMessage" resultType="Map">
+    select
+    pm.id,
+    pm.user_id,
+    pm.push_type,
+    pm.type,
+    pm.concern_fan_status,
+    pm.status,
+    pm.view_status,
+    pm.push_type_id,
+    pm.alias_type,
+    pm.alias,
+    pm.display_type,
+    pm.title,
+    pm.text,
+    pm.sound,
+    pm.play_vibrate,
+    pm.play_lights,
+    pm.play_sound,
+    pm.play_to_text,
+    pm.online_ringtone,
+    pm.custom,
+    pm.create_by_id,
+    pm.create_by_name,
+    pm.create_time,
+    pm.update_by_id,
+    pm.update_by_name,
+    pm.update_time,
+    pm.remarks
+    from
+    common_push_chat_message pm
+    <where>
+      pm.del_flag = '0'
+      and (pm.user_id = #{ew.userId} and pm.alias = #{ew.alias})
+      or (pm.alias = #{ew.alias} and pm.user_id = #{ew.userId})
+    </where>
+    order by pm.create_time desc
+  </select>
+
 </mapper>