From e0cb88c739e026e9ed6cfc89a4c17951c930c363 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 21 May 2019 14:16:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8Dbug][=E4=BF=AE=E6=94=B9][100?= =?UTF-8?q?1569]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxBillAllServiceImpl.java | 7 ++++--- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 46ff1ff18..22b095122 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -668,7 +668,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { mailMsg.setSubject("待缴账单通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelId(EnumMailMsgModel.MAIL_BILL_WAIT_PAY.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_BILL_WAIT_PAY.getCode()); + mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); mailMsg.setDynamicContentMap(map); @@ -723,8 +724,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { MailMsg mailMsg = new MailMsg(); mailMsg.setSubject("欠缴账单通知"); mailMsg.setHtml(true); - mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelId(EnumMailMsgModel.MAIL_BILL_OWE.getCode()); + mailMsg.setModelType(EnumMsgRecordType.EMAIL.getCode()); + mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); mailMsg.setDynamicContentMap(map); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index bb66f1434..b422d8acd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -753,7 +753,7 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setSubject("审批通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_APPLY_NODIFY.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); @@ -799,7 +799,7 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setSubject("审批通过通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_PASS_NODIFY.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); @@ -919,7 +919,7 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setSubject("驳回通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_REJECT_NODIFY.getCode()); mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId);