diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java index 0d24e45c4..b74a817da 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java @@ -59,4 +59,10 @@ public class BaseMsg extends BaseEntity { setTenantId(tenantEntity.getTenantId()); } + public TenantEntity getTenantInfo() { + return new TenantEntity() {{ + setTenantId(tenantId); + }}; + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java index 3ea1aed7f..264410a13 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java @@ -82,4 +82,10 @@ public class WxMsg extends BaseMsg { public void updateTenantInfo(TenantEntity tenantEntity) { setTenantId(tenantEntity.getTenantId()); } + + public TenantEntity getTenantInfo() { + return new TenantEntity() {{ + setTenantId(tenantId); + }}; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java index 093e95df1..dd2be9a21 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.WxMsg; import com.iformall.enums.EnumMsgSendStatus; @@ -53,10 +54,12 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { public void send(BaseMsg baseMsg) throws Exception{ WxMsg record = (WxMsg)baseMsg; + TenantEntity tenantEntity = record.getTenantInfo(); + WxMsgConfig wxMsgConfig = record.getWxMsgConfig(); if(wxMsgConfig == null){ wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(record.getTenantId()); + wxMsgConfig.updateTenantInfo(tenantEntity); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); if (wxMsgConfigs.size() == 0) { throw new MallinkException(ErrorCode.MSG_CONFIG_NOT_FOUND); 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 d387e25ae..24bc2da22 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 @@ -1,6 +1,7 @@ package com.iformall.service.msg.impl; import com.iformall.domain.po.WxMsgValidationcodeModel; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.MailMsg; import com.iformall.enums.EnumMsgOpen; @@ -9,6 +10,7 @@ import com.iformall.mapper.WxMsgValidationcodeModelMapper; import com.iformall.service.msg.MsgSendService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.flowable.task.service.impl.persistence.entity.TaskEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -44,10 +46,12 @@ public class SendEmailServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception{ MailMsg mailMsg = (MailMsg)baseMsg; + + TenantEntity tenantEntity = mailMsg.getTenantInfo(); //根据模板替换动态内容 if(mailMsg.getModelId() != null){ WxMsgValidationcodeModel msgModel = new WxMsgValidationcodeModel(); - msgModel.setTenantId(mailMsg.getTenantId()); + msgModel.updateTenantInfo(tenantEntity); msgModel.setType(mailMsg.getModelType()); msgModel.setModelId(mailMsg.getModelId()); msgModel.setOpen(EnumMsgOpen.OPEN.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java index 7bc7249ab..b8dce4782 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendMpMsgServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.WxTemplateMsg; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.MpAppMsg; import com.iformall.mapper.WxTemplateMsgMapper; @@ -40,11 +41,13 @@ public class SendMpMsgServiceImpl implements MsgSendService { MpAppMsg mpAppMsg = (MpAppMsg)baseMsg; WxTemplateMsg msg = null; + TenantEntity tenantEntity = mpAppMsg.getTenantInfo(); + WxMpService wxMpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(mpAppMsg.getAppId()); // 查询信息模板 WxTemplateMsg msgQ = new WxTemplateMsg(); - msgQ.setTenantId(mpAppMsg.getTenantId()); + msgQ.updateTenantInfo(tenantEntity); msgQ.setType(mpAppMsg.getTemplateType()); try { msg = wxTemplateMsgMapper.selectOne(new QueryWrapper(msgQ)); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java index ec3ce094f..8e4392258 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmartAppMsgServiceImpl.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxTemplateMsg; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.SmartAppMsg; import com.iformall.mapper.WxTemplateMsgMapper; @@ -45,6 +46,9 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception{ SmartAppMsg smartAppMsg = (SmartAppMsg)baseMsg; + + TenantEntity tenantEntity = smartAppMsg.getTenantInfo(); + WxTemplateMsg msg = null; WxMaTemplateMessage templateMessage; @@ -58,7 +62,7 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { //查询信息模板 WxTemplateMsg msgQ = new WxTemplateMsg(); - msgQ.setTenantId(smartAppMsg.getTenantId()); + msgQ.updateTenantInfo(tenantEntity); msgQ.setType(smartAppMsg.getTemplateType()); List list = wxTemplateMsgMapper.selectList(new QueryWrapper(msgQ)); if (list.size() > 0) { diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index 465f2908a..3a317c80c 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.EnumMsgOpen; @@ -43,9 +44,10 @@ public class SendSmsServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception{ WxMsgRecord record = (WxMsgRecord)baseMsg; + TenantEntity tenantEntity = record.getTenantInfo(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setPhone(record.getReceiver()); - wxMsgValidationcode.setTenantId(record.getTenantId()); + wxMsgValidationcode.updateTenantInfo(tenantEntity); wxMsgValidationcode.setType(record.getModelType()); //3、从短信配置中查询密钥 bid 等信息 diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java index ab5f92e10..94378c1ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.WxTemplateMsg; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.AppUniformMsg; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.mapper.WxTemplateMsgMapper; @@ -38,13 +39,15 @@ public class SendWeappUniformMsgServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception{ AppUniformMsg appUniformMsg = (AppUniformMsg)baseMsg; + + TenantEntity tenantEntity = appUniformMsg.getTenantInfo(); WxTemplateMsg msg = null; WxMaService wxMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appUniformMsg.getAppId()); // 查询信息模板 WxTemplateMsg msgQ = new WxTemplateMsg(); - msgQ.setTenantId(appUniformMsg.getTenantId()); + msgQ.updateTenantInfo(tenantEntity); msgQ.setType(appUniformMsg.getTemplateType()); try { msg = wxTemplateMsgMapper.selectOne(new QueryWrapper(msgQ));