Преглед изворни кода

[修复bug][修改][1001569]

release_toaliyun_real
luozukai пре 7 година
родитељ
комит
7e7f9f5e95
5 измењених фајлова са 47 додато и 7 уклоњено
  1. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/msg/MailMsg.java
  3. +35
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumMsgModelId.java
  4. +8
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java

+ 1
- 0
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( '审批通知','待办通知','欠缴账单通知','驳回通知','审批通过通知','待缴账单通知')

+ 2
- 2
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格式


+ 35
- 0
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;
}
}

+ 8
- 4
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()){


+ 1
- 1
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<WxMsgValidationcodeModel> modelList = wxMsgValidationcodeModelMapper.findList(msgModel);
if(CollectionUtils.isEmpty(modelList)){


Loading…
Откажи
Сачувај