修复消息监听角标、历史记录加载与重复订单卡片推送

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 04:17:33 +08:00
parent 53548b6a61
commit 29b8f303b3
4 changed files with 360 additions and 128 deletions
--- a/miniprogram/utils/chat-core.js
+++ b/miniprogram/utils/chat-core.js
@@ -1,7 +1,8 @@
 // utils/chat-core.js
 import GoEasy from '../static/lib/goeasy-2.13.24.esm.min';
 import { jianquanxian } from './imAuth/jianquanxian';
-import { getFreshImUser } from './im-user.js';
+import { parseOrderCardText } from './group-chat.js';
+import { persistGroupMeta } from './im-user.js';

 let _globalPrivateHandler = null;
 let _globalGroupHandler = null;
@@ -124,9 +125,15 @@ function ensureConnection(app) {

  // 连接不存在时尝试恢复
  const saved = getSavedConnection(app);
-  if (!saved || !saved.userId || !saved.identityType) return;
+  if (saved && saved.userId && saved.identityType) {
+    connectWithIdentity(app, saved.identityType, saved.userId, true);
+    return;
+  }

-  connectWithIdentity(app, saved.identityType, saved.userId, true);
+  const uid = wx.getStorageSync('uid');
+  if (uid) {
+    connectForCurrentRole(app);
+  }
 }

 function getSavedConnection(app) {
@@ -200,7 +207,9 @@ function disconnectGoEasy(app) {

 async function connectWithIdentity(app, identityType, userId, isAutoRestore = false) {
  const quanxian = await jianquanxian(app);
-  if (!quanxian.allowed) return Promise.reject(quanxian.reason);
+  if (!quanxian.allowed) {
+    return Promise.reject(new Error(quanxian.reason || '无聊天权限'));
+  }

  app.globalData.goEasyConnection.autoReconnect = true;
  app.globalData.goEasyConnection.status = 'connecting';
@@ -364,6 +373,9 @@ function removeGlobalMessageListeners() {
 }

 function setupMessageListeners(app) {
+  if (!wx.goEasy?.im || typeof wx.goEasy.im.on !== 'function') {
+    return;
+  }
  removeGlobalMessageListeners();

  _globalPrivateHandler = (message) => {
@@ -444,14 +456,8 @@ function handleNewMessage(app, message) {
 function shouldShowNotification(app) {
  if (app.globalData.messageManager.notificationMuted) return false;
  if (isDoNotDisturbTime(app)) return false;
-  if (app.globalData.pageState.isInChatPage) {
-    const pages = getCurrentPages();
-    if (pages.length > 0) {
-      const currentPage = pages[pages.length - 1];
-      if (currentPage.data && currentPage.data.currentChatId) {
-        if (isMessageFromCurrentChat(app, currentPage.data.currentChatId)) return false;
-      }
-    }
+  if (app.globalData.pageState.isInChatPage && app.globalData.pageState.currentChatId) {
+    return false;
  }
  return true;
 }
@@ -472,8 +478,16 @@ function isDoNotDisturbTime(app) {
  }
 }

-function isMessageFromCurrentChat(app, currentChatId) {
-  return false;
+function isMessageFromCurrentChat(app, message) {
+  const pageState = app.globalData.pageState || {};
+  if (!pageState.isInChatPage || !pageState.currentChatId) return false;
+  if (message.groupId) {
+    return message.groupId === pageState.currentChatId;
+  }
+  const myId = app.globalData.goEasyConnection?.userId || getCurrentGoEasyUserId();
+  if (!myId) return false;
+  const peerId = message.senderId === myId ? message.receiverId : message.senderId;
+  return peerId === pageState.currentChatId || message.senderId === pageState.currentChatId;
 }

 function showNotificationDirect(app, data) {
@@ -534,6 +548,20 @@ function formatMessageForNotification(message) {
 }

 function cacheMessage(app, message) {
+  if (message.groupId && message.type === 'text' && message.payload?.text) {
+    const card = parseOrderCardText(message.payload.text);
+    if (card && card.zhuangtai != null) {
+      if (!app.globalData.groupInfoMap) app.globalData.groupInfoMap = {};
+      const meta = {
+        ...(app.globalData.groupInfoMap[message.groupId] || {}),
+        orderId: card.orderId,
+        orderZhuangtai: card.zhuangtai,
+        orderDesc: card.jieshao,
+      };
+      app.globalData.groupInfoMap[message.groupId] = meta;
+      persistGroupMeta(app, message.groupId, meta);
+    }
+  }
  const { latestMessages } = app.globalData.messageManager;
  latestMessages.unshift({
    id: message.messageId,
--- a/miniprogram/utils/xiaoxilj.js
+++ b/miniprogram/utils/xiaoxilj.js
@@ -1,42 +1,46 @@
 /**
- * 连接管理模块 - 订单群聊跳转（后端准备群 + 稳定连接）
+ * 订单群聊跳转：先确定群 ID，IM 连接失败也尽量能进聊天页
 */
 import request from './request';
 import { persistGroupMeta } from './im-user.js';
+import { resolveLocalGroupId } from './group-chat.js';
+
 const app = getApp();

-function waitForConnection(expectedUserId, timeout = 15000) {
+function formatError(err) {
+  if (!err) return '进入聊天失败';
+  if (typeof err === 'string') return err;
+  if (err.message) return err.message;
+  if (err.content) return String(err.content);
+  if (err.msg) return String(err.msg);
+  if (err.code) return `连接失败(${err.code})`;
+  try {
+    return JSON.stringify(err);
+  } catch (e) {
+    return '进入聊天失败';
+  }
+}
+
+function withTimeout(promise, ms, errMsg) {
  return new Promise((resolve, reject) => {
-    const status = wx.goEasy?.getConnectionStatus?.();
-    const currentUserId = wx.goEasy?.im?.userId;
-    if ((status === 'connected' || status === 'reconnected') && currentUserId === expectedUserId) {
-      resolve();
-      return;
-    }
-
-    const timer = setTimeout(() => {
-      app.off('connectionChanged', handler);
-      reject(new Error('连接超时'));
-    }, timeout);
-
-    const handler = (event) => {
-      if (event.status === 'connected') {
-        const uid = event.userId || wx.goEasy?.im?.userId;
-        if (uid === expectedUserId) {
-          clearTimeout(timer);
-          app.off('connectionChanged', handler);
-          resolve();
-        }
-      } else if (event.status === 'disconnected' && event.manual) {
-        clearTimeout(timer);
-        app.off('connectionChanged', handler);
-        reject(new Error('连接已断开'));
-      }
-    };
-    app.on('connectionChanged', handler);
+    const timer = setTimeout(() => reject(new Error(errMsg || '操作超时')), ms);
+    promise
+      .then((v) => { clearTimeout(timer); resolve(v); })
+      .catch((e) => { clearTimeout(timer); reject(e); });
  });
 }

+function getConnectedUserId() {
+  const fromState = app.globalData?.goEasyConnection?.userId;
+  const fromIm = wx.goEasy?.im?.userId;
+  return fromState || fromIm || '';
+}
+
+function isImConnected() {
+  const status = wx.goEasy?.getConnectionStatus?.() || 'disconnected';
+  return status === 'connected' || status === 'reconnected';
+}
+
 async function ensureIdentityConnection(identityType, userId) {
  app.globalData.currentRole = identityType;
  wx.setStorageSync('currentRole', identityType);
@@ -50,21 +54,88 @@ async function ensureIdentityConnection(identityType, userId) {
    avatar: avatar,
  };

-  const status = wx.goEasy?.getConnectionStatus?.() || 'disconnected';
-  const currentUserId = wx.goEasy?.im?.userId;
+  if (!app.globalData.chatEnabled || !wx.goEasy?.im) {
+    throw new Error('聊天服务未就绪，请稍后重试');
+  }

-  if ((status === 'connected' || status === 'reconnected') && currentUserId === userId) {
+  if (isImConnected() && getConnectedUserId() === userId) {
    return;
  }

-  if (currentUserId && currentUserId !== userId && app.disconnectGoEasy) {
+  const connectedId = getConnectedUserId();
+  if (connectedId && connectedId !== userId && app.disconnectGoEasy) {
    await app.disconnectGoEasy();
  }

-  const waitPromise = waitForConnection(userId);
-  const connectPromise = app.connectWithIdentity(identityType, userId, true);
-  await waitPromise;
-  await connectPromise;
+  if (!app.connectWithIdentity) {
+    throw new Error('聊天功能未初始化');
+  }
+
+  await withTimeout(
+    app.connectWithIdentity(identityType, userId, true),
+    12000,
+    'IM连接超时'
+  );
+
+  if (!isImConnected()) {
+    throw new Error('IM连接失败，请检查网络后重试');
+  }
+}
+
+async function prepareGroupChat(identityType, userId, orderId, partnerUid, fadanPingtai, groupName, isCross) {
+  let chatData = null;
+
+  try {
+    const res = await withTimeout(
+      request({
+        url: '/dingdan/ltdhzb',
+        method: 'POST',
+        data: {
+          dingdan_id: orderId,
+          identityType,
+          push_order_card: false,
+        },
+      }),
+      12000,
+      '准备群聊超时'
+    );
+    const body = res?.data || {};
+    if (body.code === 0 && body.data?.groupId) {
+      chatData = body.data;
+    } else if (body.msg) {
+      console.warn('ltdhzb:', body.msg);
+    }
+  } catch (e) {
+    console.warn('ltdhzb 请求失败，尝试本地 groupId', e);
+  }
+
+  if (!chatData?.groupId) {
+    const myUid = userId.replace(/^(Ds|Sj|Boss)/, '');
+    let localGroupId = resolveLocalGroupId(
+      identityType, myUid, partnerUid, fadanPingtai, orderId, isCross
+    );
+    if (!localGroupId && orderId) {
+      localGroupId = `group_${orderId}`;
+    }
+    if (!localGroupId) {
+      throw new Error('无法确定群聊，请确认订单已接单且对方信息完整');
+    }
+    chatData = {
+      groupId: localGroupId,
+      orderId,
+      groupName: groupName || '订单群聊',
+      isCross: isCross || fadanPingtai || 0,
+    };
+    try {
+      await request({
+        url: '/dingdan/ltdhzb',
+        method: 'POST',
+        data: { dingdan_id: orderId, identityType, push_order_card: false },
+      });
+    } catch (e) { /* ignore */ }
+  }
+
+  return chatData;
 }

 class ConnectionManager {
@@ -89,39 +160,30 @@ class ConnectionManager {
    };

    const param = { to, currentUser };
-    const path = '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param));
-    wx.navigateTo({ url: path });
+    wx.navigateTo({ url: '/pages/liaotian/liaotian?data=' + encodeURIComponent(JSON.stringify(param)) });
  }

  async connectToGroupChat(params) {
-    const { identityType, userId, orderId, groupName, groupAvatar, isCross } = params;
+    const {
+      identityType, userId, orderId, groupName, groupAvatar, isCross,
+      partnerUid, fadanPingtai,
+    } = params;
+
    if (!identityType || !userId || !orderId) {
-      throw new Error('参数不完整：identityType, userId, orderId 必填');
+      throw new Error('参数不完整');
    }

+    app.globalData.currentRole = identityType;
+    wx.setStorageSync('currentRole', identityType);
+
    wx.showLoading({ title: '建立联系中...', mask: true });

    try {
-      await ensureIdentityConnection(identityType, userId);
+      const chatData = await prepareGroupChat(
+        identityType, userId, orderId, partnerUid, fadanPingtai || isCross, groupName, isCross
+      );

-      const res = await request({
-        url: '/dingdan/ltdhzb',
-        method: 'POST',
-        data: {
-          dingdan_id: orderId,
-          identityType,
-          push_order_card: true,
-        },
-      });
-
-      const body = res?.data || {};
-      if (body.code !== 0 || !body.data || !body.data.groupId) {
-        throw new Error(body.msg || '准备群聊失败');
-      }
-
-      const chatData = body.data;
      const realGroupId = chatData.groupId;
-
      let avatar = chatData.counterpartAvatar || chatData.groupAvatar || groupAvatar || '';
      if (avatar && !avatar.startsWith('http')) {
        avatar = app.globalData.ossImageUrl + avatar.replace(/^\//, '');
@@ -148,30 +210,57 @@ class ConnectionManager {
      app.globalData.groupInfoMap[realGroupId] = meta;
      persistGroupMeta(app, realGroupId, meta);

-      await new Promise((resolve, reject) => {
-        wx.goEasy.im.subscribeGroup({
-          groupIds: [realGroupId],
-          onSuccess: () => resolve(),
-          onFailed: (error) => reject(error),
-        });
-      });
+      let imReady = false;
+      try {
+        await ensureIdentityConnection(identityType, userId);
+        imReady = true;
+        try {
+          await withTimeout(
+            new Promise((resolve, reject) => {
+              wx.goEasy.im.subscribeGroup({
+                groupIds: [realGroupId],
+                onSuccess: () => resolve(),
+                onFailed: (error) => reject(error),
+              });
+            }),
+            8000,
+            '订阅群聊超时'
+          );
+        } catch (subErr) {
+          console.warn('订阅群聊失败，仍尝试进入页面', subErr);
+        }
+      } catch (imErr) {
+        console.warn('IM连接失败，仍进入聊天页由页面重连', imErr);
+      }

+      const uid = userId.replace(/^(Ds|Sj|Boss)/, '');
      const param = {
        groupId: realGroupId,
        orderId: chatData.orderId || orderId,
        groupName: chatData.counterpartName || chatData.groupName || groupName || '订单群聊',
        groupAvatar: avatar,
        isCross: chatData.isCross != null ? chatData.isCross : (isCross || 0),
+        currentUserId: userId,
+        currentUserName: app.globalData.currentUser?.name || `用户${uid}`,
+        currentUserAvatar: app.globalData.currentUser?.avatar ||
+          (wx.getStorageSync('touxiang') || (app.globalData.ossImageUrl + app.globalData.morentouxiang)),
+        orderZhuangtai: chatData.orderZhuangtai,
+        orderJine: chatData.orderJine,
+        orderDesc: chatData.orderDesc || '',
+        imReady,
      };

      wx.hideLoading();
      wx.navigateTo({
        url: '/pages/qunliaotian/qunliaotian?data=' + encodeURIComponent(JSON.stringify(param)),
+        fail: (navErr) => {
+          wx.showToast({ title: formatError(navErr), icon: 'none', duration: 2500 });
+        },
      });
    } catch (err) {
      wx.hideLoading();
      console.error('跳转群聊失败:', err);
-      wx.showToast({ title: err.message || '进入聊天失败', icon: 'none' });
+      wx.showToast({ title: formatError(err), icon: 'none', duration: 2500 });
      throw err;
    }
  }