From f9efa0a10f6002363c0b9ca7a830c102f2a2db61 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 10 Jul 2019 12:38:38 +0800 Subject: [PATCH] =?UTF-8?q?[][=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=9A=E6=80=81=E5=88=86=E6=9E=90=E5=88=97=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/enums/EnumMailMsgModel.java | 6 +++++ .../service/impl/WxFlowServiceImpl.java | 24 ++++++++++++------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java index d4788b732..5173720e3 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMailMsgModel.java @@ -11,6 +11,12 @@ public enum EnumMailMsgModel { MAIL_BILL_OWE(13, "欠缴账单通知"), MAIL_ASSIGNEE_NODIFY(14, "代办通知"), MAIL_REJECT_NODIFY(15, "驳回通知"), + + //卷 + MAIL_C_PASS_NODIFY(24, "审批通过通知"), + MAIL_C_APPLY_NODIFY(25, "审批通知"), + MAIL_C_ASSIGNEE_NODIFY(26, "代办通知"), + MAIL_C_REJECT_NODIFY(27, "驳回通知"), ; public static EnumMailMsgModel getEnum(Integer code) { 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 cc0c4198a..db1aee899 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -444,8 +444,10 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); }else if(isCoupon(flowType)){ - msgReplaceMap.put("bustype","有价券"); - msgReplaceMap.put("contract",businessId.toString()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_C_ASSIGNEE_NODIFY.getCode()); + WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); + msgReplaceMap.put("name",wxCoupon.getTitle()); } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); @@ -893,8 +895,10 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); }else if(isCoupon(flowType)){ - msgReplaceMap.put("bustype","有价券"); - msgReplaceMap.put("contract",businessId.toString()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_C_APPLY_NODIFY.getCode()); + WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); + msgReplaceMap.put("name",wxCoupon.getTitle()); } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); @@ -949,8 +953,10 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); }else if(isCoupon(flowType)){ - msgReplaceMap.put("bustype","有价券"); - msgReplaceMap.put("contract",businessId.toString()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_C_PASS_NODIFY.getCode()); + WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); + msgReplaceMap.put("name",wxCoupon.getTitle()); } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); @@ -1102,8 +1108,10 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); }else if(isCoupon(flowType)){ - msgReplaceMap.put("bustype","有价券"); - msgReplaceMap.put("contract",businessId.toString()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_C_REJECT_NODIFY.getCode()); + WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId); + msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage()); + msgReplaceMap.put("name",wxCoupon.getTitle()); } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());