From d802b9da1ff266393614e23a186d67d031ea04ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Mon, 15 Sep 2025 15:42:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=BE=AE=E4=BF=A1=E5=AE=A2=E6=9C=8D):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=AE=E4=BF=A1=E5=A5=BD=E5=8F=8B=E5=92=8C?=
 =?UTF-8?q?=E7=BE=A4=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加获取微信好友列表和群列表的API接口
- 移除旧的初始化联系人列表逻辑，改用新接口
- 清理不再使用的会话过滤和排序代码
---
 Touchkebao/src/pages/pc/ckbox/weChat/api.ts   | 10 +++++++
 .../src/pages/pc/ckbox/weChat/index.tsx       | 28 +++++++++----------
 Touchkebao/src/pages/pc/ckbox/weChat/main.ts  | 17 +++++------
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/api.ts b/Touchkebao/src/pages/pc/ckbox/weChat/api.ts
index 57f6cdf2..cef0df31 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/api.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/api.ts
@@ -12,6 +12,16 @@ import {
   ChatSettings,
 } from "./data";
 
+// 好友列表
+export function getWechatFriendList() {
+  return request("/v1/kefu/wechatFriend/list", {}, "GET");
+}
+
+// 群列表
+export function getWechatChatroomList() {
+  return request("/v1/kefu/wechatChatroom/list", {}, "GET");
+}
+
 //群、好友聊天记录列表
 export function getChatroomList() {
   return request("/v1/kefu/wechatChatroom/list", {}, "GET");
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx b/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
index f3d6e786..88255d2c 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/index.tsx
@@ -22,21 +22,21 @@ const CkboxPage: React.FC = () => {
     setLoading(true);
     chatInitAPIdata()
       .then(response => {
-        const data = response as {
-          contractList: any[];
-          groupList: any[];
-          kfUserList: KfUserListData[];
-          newContractList: { groupName: string; contacts: any[] }[];
-        };
-        const { contractList } = data;
+        // const data = response as {
+        //   contractList: any[];
+        //   groupList: any[];
+        //   kfUserList: KfUserListData[];
+        //   newContractList: { groupName: string; contacts: any[] }[];
+        // };
+        // const { contractList } = data;
 
-        //找出已经在聊天的
-        const isChatList = contractList.filter(
-          v => (v?.config && v.config?.chat) || false,
-        );
-        isChatList.forEach(v => {
-          addChatSession(v);
-        });
+        // //找出已经在聊天的
+        // const isChatList = contractList.filter(
+        //   v => (v?.config && v.config?.chat) || false,
+        // );
+        // isChatList.forEach(v => {
+        //   addChatSession(v);
+        // });
 
         // 数据加载完成后初始化WebSocket连接
         initSocket();
diff --git a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
index 151e8a26..1caef8a0 100644
--- a/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
+++ b/Touchkebao/src/pages/pc/ckbox/weChat/main.ts
@@ -15,6 +15,8 @@ import {
   getGroupList,
   getAgentList,
   getChatroomList,
+  getWechatFriendList,
+  getWechatChatroomList,
 } from "./api";
 
 import { useUserStore } from "@/store/module/user";
@@ -31,7 +33,7 @@ const { login2 } = useUserStore.getState();
 export const chatInitAPIdata = async () => {
   try {
     //获取联系人列表
-    const contractList = await getAllContactList();
+    const contractList = await getWechatFriendList();
 
     //获取联系人列表
     asyncContractList(contractList);
@@ -51,12 +53,12 @@ export const chatInitAPIdata = async () => {
     await asyncCountLables(countLables);
 
     //获取消息会话列表并按lastUpdateTime排序
-    const filterUserSessions = contractList?.filter(
-      v => v?.config && v.config?.chat,
-    );
-    const filterGroupSessions = groupList?.filter(
-      v => v?.config && v.config?.chat,
-    );
+    // const filterUserSessions = contractList?.filter(
+    //   v => v?.config && v.config?.chat,
+    // );
+    // const filterGroupSessions = groupList?.filter(
+    //   v => v?.config && v.config?.chat,
+    // );
     //排序功能
     // const sortedSessions = [...filterUserSessions, ...filterGroupSessions].sort(
     //   (a, b) => {
@@ -81,7 +83,6 @@ export const chatInitAPIdata = async () => {
     //   },
     // );
     const sortedSessions = await getChatroomList();
-    console.log("sortedSessions", sortedSessions);
     //会话数据同步
     asyncChatSessions(sortedSessions);