diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql new file mode 100644 index 000000000..b690b621a --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql @@ -0,0 +1 @@ +update wx_msg_validationcode_model set model_id=500 where name in( '审批通知','待办通知','欠缴账单通知','驳回通知','审批通过通知','待缴账单通知') \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/MailMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/MailMsg.java index b031ccafc..e94faec09 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/MailMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/MailMsg.java @@ -1,10 +1,8 @@ package com.iformall.domain.po.msg; -import com.iformall.domain.po.msg.BaseMsg; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import java.util.Map; /** @@ -22,6 +20,8 @@ public class MailMsg extends BaseMsg { private String from; private String msg; + private Integer modelType; + //标题 private String subject; //是否html格式 diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModelId.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModelId.java new file mode 100644 index 000000000..806597b2d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModelId.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + +/** + * Created by luozukai + * 短信模板 + */ +public enum EnumMsgModelId { + MAIL_MSG_FLOW(500, "审批流通知"), + ; + + public static EnumMsgModelId getEnum(Integer code) { + for (EnumMsgModelId value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMsgModelId(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} 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 4d29446fb..bb66f1434 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -474,7 +474,8 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setSubject("待办通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelId(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); + mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); if(1 == flowType.intValue() || 3 == flowType.intValue()){ @@ -752,7 +753,8 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setSubject("审批通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelId(EnumMailMsgModel.MAIL_APPLY_NODIFY.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); + mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); if(1 == flowType.intValue() || 3 == flowType.intValue()){ @@ -797,7 +799,8 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setSubject("审批通过通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelId(EnumMailMsgModel.MAIL_PASS_NODIFY.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); + mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); if(1 == flowType.intValue() || 3 == flowType.intValue()){ @@ -916,7 +919,8 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setSubject("驳回通知"); mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelId(EnumMailMsgModel.MAIL_REJECT_NODIFY.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); + mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); if(1 == flowType.intValue() || 3 == flowType.intValue()){ diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java index a38ba2ea0..297755934 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java @@ -47,7 +47,7 @@ public class SendEmailServiceImpl implements MsgSendService { if(mailMsg.getModelId() != null){ WxMsgValidationcodeModel msgModel = new WxMsgValidationcodeModel(); msgModel.setTenantId(mailMsg.getTenantId()); - msgModel.setType(mailMsg.getModelId()); + msgModel.setType(mailMsg.getModelType()); msgModel.setModelId(mailMsg.getModelId()); List modelList = wxMsgValidationcodeModelMapper.findList(msgModel); if(CollectionUtils.isEmpty(modelList)){