diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index e8f28f860..302a08e28 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.WxMsgCallback; import com.iformall.domain.po.WxMsgConfig; import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.domain.po.WxMsgValidationcodeModel; +import com.iformall.enums.EnumMsgModel; import com.iformall.enums.EnumMsgSendStatus; import com.iformall.enums.EnumVerifyCode; import com.iformall.mapper.*; @@ -71,7 +72,7 @@ public class BillNotificationSchedule { WxMsgConfig wxMsgConfig = checkMsgConfig(tenantId); if (wxMsgConfig != null) { logger.info("欠缴账单获取模板内容"); - WxMsgValidationcodeModel wxMsgValidationcodeModel = getMsgModel(tenantId, 7); + WxMsgValidationcodeModel wxMsgValidationcodeModel = getMsgModel(tenantId, EnumMsgModel.BILL_OWE.getCode()); if (wxMsgValidationcodeModel != null) { String signature = wxMsgValidationcodeModel.getSignature(); String msg = wxMsgValidationcodeModel.getContent(). @@ -102,7 +103,7 @@ public class BillNotificationSchedule { WxMsgConfig wxMsgConfig = checkMsgConfig(tenantId); if (wxMsgConfig != null) { logger.info("待缴账单获取模板内容"); - WxMsgValidationcodeModel wxMsgValidationcodeModel = getMsgModel(tenantId, 7); + WxMsgValidationcodeModel wxMsgValidationcodeModel = getMsgModel(tenantId, EnumMsgModel.BILL_WAIT_PAY.getCode()); if (wxMsgValidationcodeModel != null) { String signature = wxMsgValidationcodeModel.getSignature(); String msg = wxMsgValidationcodeModel.getContent(). diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java index 2dd615579..4c955d020 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java @@ -6,10 +6,14 @@ package com.iformall.enums; */ public enum EnumMsgModel { // type,name + MALL_APPLY(1, "申请试用"), FLOW_ASSIGNEE_NODIFY(2, "代办通知"), FLOW_APPLY_NODIFY(3, "审批通知"), FLOW_PASS_NODIFY(4, "通过审批通知"), - FLOW_REJECT_NODIFY(5, "驳回通知") + FLOW_REJECT_NODIFY(5, "驳回通知"), + VALIDATION_CODE(6, "B端验证码"), + BILL_WAIT_PAY(7, "账单待缴通知"), + BILL_OWE(8, "账单欠缴通知") ; public static EnumMsgModel getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index f012a334f..0d94b07ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.enums.EnumMsgModel; import com.iformall.enums.EnumMsgSendStatus; import com.iformall.enums.EnumVerifyCode; import com.iformall.mapper.*; @@ -156,8 +157,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); wxMsgValidationcodeModel.setTenantId(wxMsgConfig.getTenantId()); - wxMsgValidationcodeModel.setType(wxMsgValidationcode.getType()); - wxMsgValidationcodeModel.setName("验证码"); + wxMsgValidationcodeModel.setType(EnumMsgModel.VALIDATION_CODE.getCode()); wxMsgValidationcodeModel = wxMsgValidationcodeModelMapper.findList(wxMsgValidationcodeModel).get(0); wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature());