refactor(wechat): 优化消息接收处理和数据库结构

- 移除未使用的kfUserService导入
- 为weChatGroup和ContractData接口添加serverId字段
- 重构receivedMsg方法，根据消息类型从数据库获取会话信息
- 简化数据库表结构，移除冗余的WithServerId接口

Cunkebao/src/pages/pc/ckbox/components/SidebarMenu/MessageList/index.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { List, Avatar, Badge } from "antd";
 import { UserOutlined, TeamOutlined } from "@ant-design/icons";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
@@ -15,6 +15,9 @@ const MessageList: React.FC<MessageListProps> = () => {
   const onContactClick = (session: ContractData | weChatGroup) => {
     setCurrentContact(session, true);
   };
+  // useEffect(() => {
+  //   console.log(chatSessions);
+  // }, [chatSessions]);
   return (
     <div className={styles.messageList}>
       <List

Cunkebao/src/pages/pc/ckbox/data.ts

@@ -115,17 +115,19 @@ export interface weChatGroup {
   config?: {
     chat: boolean;
   };
-  labels: string[];
+  labels?: string[];
   unreadCount: number;
   notice: string;
   selfDisplyName: string;
   wechatChatroomId: number;
+  serverId?: number;
   [key: string]: any;
 }
 
 // 联系人数据接口
 export interface ContractData {
   id?: number;
+  serverId?: number;
   wechatAccountId: number;
   wechatId: string;
   alias: string;

Cunkebao/src/store/module/ckchat/ckchat.ts

@@ -7,7 +7,7 @@ import {
   KfUserListData,
   ContactGroupByLabel,
 } from "@/pages/pc/ckbox/data";
-import { kfUserService, weChatGroupService, contractService } from "@/utils/db";
+import { weChatGroupService, contractService } from "@/utils/db";
 import { createContractList } from "@/store/module/ckchat/api";
 
 export const useCkChatStore = createPersistStore<CkChatState>(

Cunkebao/src/store/module/weChat/weChat.ts

@@ -8,6 +8,7 @@ import {
 import { WeChatState } from "./weChat.data";
 import { clearUnreadCount, updateConfig } from "@/pages/pc/ckbox/api";
 import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
+import { weChatGroupService, contractService } from "@/utils/db";
 import {
   addChatSession,
   updateChatSession,
@@ -87,12 +88,12 @@ export const useWeChatStore = create<WeChatState>()(
         }));
       },
 
-      receivedMsg: message => {
+      receivedMsg: async message => {
         const currentContract = useWeChatStore.getState().currentContract;
         //判断群还是好友
         const getMessageId =
           message?.wechatChatroomId || message.wechatFriendId;
-
+        const isWechatGroup = message?.wechatChatroomId;
         //当前选中聊天的群或好友
         if (currentContract && currentContract.id == getMessageId) {
           set(state => ({
@@ -106,11 +107,15 @@ export const useWeChatStore = create<WeChatState>()(
             session.unreadCount = Number(session.unreadCount) + 1;
             updateChatSession(session);
           } else {
-            // 新增会话
+            if (isWechatGroup) {
-            addChatSession({
+              const [group] = await weChatGroupService.findByIds(getMessageId);
-              ...session,
+              if (group) {
-              unreadCount: 1,
+                addChatSession(group);
-            });
+              }
+            } else {
+              const [user] = await contractService.findByIds(getMessageId);
+              addChatSession(user);
+            }
           }
         }
       },

Cunkebao/src/utils/db.ts

@@ -39,16 +39,6 @@ export interface KfUserWithServerId extends Omit<KfUserListData, "id"> {
   id?: number; // 接口数据的原始ID字段
 }
 
-export interface weChatGroupServerId extends Omit<weChatGroup, "id"> {
-  serverId: number | string; // 服务器ID作为主键
-  id?: number; // 接口数据的原始ID字段
-}
-
-export interface ContractWithServerId extends Omit<ContractData, "id"> {
-  serverId: number | string; // 服务器ID作为主键
-  id?: number; // 接口数据的原始ID字段
-}
-
 // 新联系人列表数据接口
 export interface NewContactListData {
   serverId: number | string; // 服务器ID作为主键
@@ -61,8 +51,8 @@ export interface NewContactListData {
 // 数据库类
 class CunkebaoDatabase extends Dexie {
   kfUsers!: Table<KfUserWithServerId>;
-  weChatGroup!: Table<weChatGroupServerId>;
+  weChatGroup!: Table<weChatGroup>;
-  contracts!: Table<ContractWithServerId>;
+  contracts!: Table<ContractData>;
   newContractList!: Table<NewContactListData>;
   messageList!: Table<MessageListData>;
 
@@ -74,7 +64,7 @@ class CunkebaoDatabase extends Dexie {
       kfUsers:
         "serverId, id, tenantId, wechatId, nickname, alias, avatar, gender, region, signature, bindQQ, bindEmail, bindMobile, createTime, currentDeviceId, isDeleted, deleteTime, groupId, memo, wechatVersion, lastUpdateTime, isOnline",
       weChatGroup:
-        "serverId, id, wechatAccountId, tenantId, accountId, chatroomId, chatroomOwner, conRemark, nickname, chatroomAvatar, groupId, config, unreadCount, notice, selfDisplyName",
+        "serverId, id, wechatAccountId, tenantId, accountId, chatroomId, chatroomOwner, conRemark, nickname, chatroomAvatar,wechatChatroomId, groupId, config, unreadCount, notice, selfDisplyName",
       contracts:
         "serverId, id, wechatAccountId, wechatId, alias, conRemark, nickname, quanPin, avatar, gender, region, addFrom, phone, signature, accountId, extendFields, city, lastUpdateTime, isPassed, tenantId, groupId, thirdParty, additionalPicture, desc, config, lastMessageTime, unreadCount, duplicate",
       newContractList: "serverId, id, groupName, contacts",