From 22f1a2c0bfb45d5b3c70c289e485c0b8b04fed3b Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 28 Mar 2024 10:38:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5:=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=BF=94=E5=9B=9E=E7=9A=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81=E6=98=BE=E7=A4=BA;=20+=E5=90=8E=E7=BB=AD=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/msgUtils.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/lib/msgUtils.js b/src/lib/msgUtils.js index bd32149..7f71f99 100644 --- a/src/lib/msgUtils.js +++ b/src/lib/msgUtils.js @@ -290,7 +290,16 @@ export const receivedMsgTypeMapped = { // 发送消息的同步返回: 发送失败时 getMsg: (result) => result, contentToRender: () => null, - contentToUpdate: (msgcontent) => ({ ...msgcontent, id: msgcontent.actionId, status: msgcontent?.status || 'failed', dateString: `发送失败 ${msgcontent.error.message} ❌`, conversationid: msgcontent.actionId.split('.')[0], }), + contentToUpdate: (msgcontent) => { + const waCode = msgcontent.error.message.match(/\(#(\d+)\)/); + const waError = whatsappError?.[waCode?.[1]] || msgcontent.error.message; + return { + ...msgcontent, + id: msgcontent.actionId, + status: msgcontent?.status || 'failed', + dateString: `发送失败 ${waError} \n[${msgcontent.error.code}] ${whatsappError[msgcontent.error.code]} ❌`, + conversationid: msgcontent.actionId.split('.')[0], + };}, }, }; export const whatsappMsgTypeMapped = { @@ -568,8 +577,9 @@ export const parseRenderMessageList = (messages) => { }); }; export const whatsappError = { - '131026': '[131026] 消息无法投递(未注册/使用旧版/未同意政策).', - '131047': '[131047] 会话超过24小时.', + 'BAD_REQUEST': '无法发送, 请使用邮件联系.', + '131026': '[131026] 消息无法投递(未注册/使用旧版/未同意政策).\n请稍后重试或使用邮件联系', + '131047': '[131047] 会话超过24小时或未激活. \n请使用模板消息发送', '131053': '[131053] 文件上传失败.', '131048': '[131048] 账户被风控.', // 消息发送太多, 达到垃圾数量限制 '131031': '[131031] 账户已锁定.',