From b050f8f0ad6d62228bd73a3f666883e2737f5523 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 18 Apr 2019 15:12:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E6=9C=9F=E4=BC=98=E5=8C=96][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E8=B4=A6=E6=9C=9F?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/enums/EnumMailMsgModel.java | 2 +- .../src/main/java/com/iformall/enums/EnumMsgModel.java | 2 +- .../src/main/java/com/iformall/service/WxBillAllService.java | 2 +- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 2 +- .../main/java/com/iformall/service/impl/WxFlowServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java index d72f7e0a6..3f7677003 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java @@ -6,7 +6,7 @@ package com.iformall.enums; */ public enum EnumMailMsgModel { MAIL_PASS_NODIFY(345, "审批通过通知"), - MAIL_BILL_WAIT_PAY(346, "代缴账单通知"), + MAIL_BILL_WAIT_PAY(346, "待缴账单通知"), MAIL_APPLY_NODIFY(347, "审批通知"), MAIL_BILL_OWE(348, "欠缴账单通知"), MAIL_ASSIGNEE_NODIFY(349, "代办通知"), diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java index 936a8b9fd..9c118be3c 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java @@ -7,7 +7,7 @@ package com.iformall.enums; public enum EnumMsgModel { // type,name MALL_APPLY(1, "申请试用"), - FLOW_ASSIGNEE_NODIFY(2, "代办通知"), + FLOW_ASSIGNEE_NODIFY(2, "待办通知"), FLOW_APPLY_NODIFY(3, "审批通知"), FLOW_PASS_NODIFY(4, "通过审批通知"), FLOW_REJECT_NODIFY(5, "驳回通知"), diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 9107cb3a5..5d479fed4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -27,7 +27,7 @@ public interface WxBillAllService { Long hasOweBill(Long contractId,Integer type); /** - * 发送代缴通知邮件 + * 发送待缴通知邮件 */ void sendWaitPayBillEmail(); 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 bf94a31e1..e9d983479 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -661,7 +661,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { map.put("linkName",manager==null?"":manager); map.put("linkPhone",managerPhone==null?"":managerPhone); MailMsg mailMsg = new MailMsg(); - mailMsg.setSubject("代缴账单通知"); + mailMsg.setSubject("待缴账单通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); mailMsg.setModelId(EnumMailMsgModel.MAIL_BILL_WAIT_PAY.getCode()); 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 2ac6e0fe3..de7fc6823 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -426,7 +426,7 @@ public class WxFlowServiceImpl implements WxFlowService { } msgReplaceMap.put("taskList", taskListHtml); MailMsg mailMsg = new MailMsg(); - mailMsg.setSubject("代办通知"); + mailMsg.setSubject("待办通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); mailMsg.setModelId(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode());