fix: 多客户端会话的消息同步时, 新会话号码

dev/mobile
Lei OT 1 year ago
parent dcb5e57282
commit 6dfd4b9e1f

@ -106,7 +106,7 @@ const websocketSlice = (set, get) => ({
}, },
handleMessage: (data) => { handleMessage: (data) => {
olog('handleMessage------------------'); olog('handleMessage------------------');
console.log(data); // console.log(data);
const { updateMessageItem, sentOrReceivedNewMessage } = get(); const { updateMessageItem, sentOrReceivedNewMessage } = get();
const { errcode, errmsg, result } = data; const { errcode, errmsg, result } = data;
@ -232,7 +232,7 @@ const messageSlice = (set, get) => ({
})), })),
updateMessageItem: (message) => { updateMessageItem: (message) => {
// msgUpdate // msgUpdate
console.log('UPDATE_SENT_MESSAGE_ITEM-----------------------------------------------------------------'); // console.log('UPDATE_SENT_MESSAGE_ITEM-----------------------------------------------------------------', message);
// 更新会话中的消息 // 更新会话中的消息
const { activeConversations, conversationsList, currentConversation } = get(); const { activeConversations, conversationsList, currentConversation } = get();
const targetId = message.conversationid; const targetId = message.conversationid;
@ -263,7 +263,8 @@ const messageSlice = (set, get) => ({
conversation_expiretime: message?.conversation?.expireTime || conversationsList[targetIndex].conversation_expiretime || '', // 保留使用UTC时间 conversation_expiretime: message?.conversation?.expireTime || conversationsList[targetIndex].conversation_expiretime || '', // 保留使用UTC时间
}); });
} else if (targetIndex === -1) { } else if (targetIndex === -1) {
// 当前客户端不存在的会话 todo: 设置为当前(在WhatsApp返回号码不一致时) // 当前客户端不存在的会话
// todo: 设置为当前(在WhatsApp返回号码不一致时)
newConversations = [{ newConversations = [{
...conversationRow, ...conversationRow,
...message, ...message,
@ -271,9 +272,9 @@ const messageSlice = (set, get) => ({
opi_sn: currentConversation.opi_sn, // todo: coli sn opi_sn: currentConversation.opi_sn, // todo: coli sn
last_received_time: message.date, last_received_time: message.date,
unread_msg_count: 0, unread_msg_count: 0,
whatsapp_name: message?.senderName || message?.sender || '', whatsapp_name: message.to, //message?.senderName || message?.sender || '',
customer_name: message?.senderName || message?.sender || '', customer_name: message.to, // message?.senderName || message?.sender || '',
whatsapp_phone_number: message.from, whatsapp_phone_number: message.to,
conversation_expiretime: message?.conversation?.expireTime || '', // 保留使用UTC时间 conversation_expiretime: message?.conversation?.expireTime || '', // 保留使用UTC时间
}]; }];
} }

Loading…
Cancel
Save