diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java index 6a251375c..ef24bc4b7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTemplateMsg.java @@ -24,5 +24,7 @@ public class WxTemplateMsg extends TenantEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value="消息开关(0/1)",name="onOff") + private Integer onOff; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java index e8667fad8..6bd36fec4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java @@ -7,10 +7,5 @@ import com.iformall.domain.po.WxTemplateMsg; public interface WxTemplateMsgMapper extends CommonMapper { List findList(WxTemplateMsg wxTemplateMsg); - - - - - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 256c86ee6..44b122528 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -980,7 +980,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { )); try { - mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + //mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } catch (Exception e) { logger.error("支付通知发送失败: " + e.getMessage()); throw new MallinkException(ErrorCode.TEMPLATE_SEND_FAILED); @@ -1014,7 +1014,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { )); try { - mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); +// mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } catch (Exception e) { logger.error("支付通知发送失败: " + e.getMessage()); throw new MallinkException(ErrorCode.TEMPLATE_SEND_FAILED); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java index d24b6d100..ec3486cae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java @@ -244,7 +244,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { )); try { - mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); +// mqBaseProducer.sendMessage(smartAppMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } catch (Exception e) { logger.error("砍价成功通知发送失败: " + e.getMessage()); throw new MallinkException(ErrorCode.TEMPLATE_SEND_FAILED); 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 fef5760c3..d03ab6bb7 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 @@ -76,22 +76,22 @@ public class SendSmartAppMsgServiceImpl implements MsgSendService { // throw new MallinkException(ErrorCode.TEMPLATE_NOT_FOUND); return; } - - JSONObject customParam = JSON.parseObject(msg.getCustomParam()); - String url = customParam.getString("url"); - String emphasis = customParam.getString("emphasis"); - - // build template data list - List dataList = smartAppMsg.getDataList(); - JSONArray indexArr = customParam.getJSONArray("index"); - - List dataTempList = new ArrayList<>(); - for(int i=0;i dataList = smartAppMsg.getDataList(); + JSONArray indexArr = customParam.getJSONArray("index"); + + List dataTempList = new ArrayList<>(); + for(int i=0;i dataTempList = new ArrayList<>(); // for(int i=0;i + - `id`,`tenant_id`,`parent_tenant_id`,`template_id`,`type`,`create_date`,`update_date` + `id`,`tenant_id`,`parent_tenant_id`,`template_id`,`type`,`create_date`,`update_date`,`on_off` @@ -44,6 +45,9 @@ and `update_date` = #{updateDate} + + and `on_off` = #{onOff} + and id in