From 39325cd3ed75e12b162271eea821affb07983806 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 12 Nov 2020 18:23:46 +0800 Subject: [PATCH] bug --- .../src/main/java/com/iformall/domain/po/msg/WxMsg.java | 5 +++++ .../java/com/iformall/service/impl/WxMsgServiceImpl.java | 4 ++++ 2 files changed, 9 insertions(+) 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 904f0e48e..1043943e8 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; import com.iformall.domain.po.WxCouponInject; import com.iformall.domain.po.WxMsgConfig; +import com.iformall.domain.po.WxTemplateMsg; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -69,6 +70,10 @@ public class WxMsg extends BaseMsg { @io.swagger.annotations.ApiModelProperty(value = "couponInjectId", name = "couponInjectId") private Long couponInjectId; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "模板消息", name = "wxTemplateMsg") + private WxTemplateMsg wxTemplateMsg; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "用于mq发送消息", name = "wxMsgConfig") private WxMsgConfig wxMsgConfig; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index ca15bbf0d..bd25911e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -110,6 +110,10 @@ public class WxMsgServiceImpl implements WxMsgService { int error = wxMsgCallbackMapper.queryMsgSendTotal(params); wxMsg.setSuccessNumber(success); wxMsg.setErrorNumber(error); + if(null != wxMsg.getModelId() && wxMsg.getWay() == EnumSendWay.APPINFOR.getCode()){ + WxTemplateMsg wxTemplateMsg = wxTemplateMsgMapper.selectById(wxMsg.getModelId()); + wxMsg.setWxTemplateMsg(wxTemplateMsg); + } return wxMsg; }