diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notice/NoticeConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notice/NoticeConvert.java index 5431b270..8093b966 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notice/NoticeConvert.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notice/NoticeConvert.java @@ -77,7 +77,7 @@ public interface NoticeConvert { * @param miniProgramState 小程序的状态 * @return 提醒模板 */ - default SubscribeMessageReqDTO convertBirthday(String openId, String miniProgramState) { + default SubscribeMessageReqDTO convertBirthday(String type, String openId, String miniProgramState) { SubscribeMessageReqDTO message = new SubscribeMessageReqDTO(); message.setToUser(openId); @@ -86,8 +86,26 @@ public interface NoticeConvert { //消息类型 MsgData noticeType = new MsgData(); noticeType.setName("phrase8"); - noticeType.setValue("生日提醒"); + + //消息内容 + MsgData content = new MsgData(); + content.setName("thing2"); + + switch (type) { + case "birthday": + noticeType.setValue("生日提醒"); + content.setValue("今天有人过生日,请前往PC端查看!"); + break; + case "regular": + noticeType.setValue("转正提醒"); + content.setValue("恭喜快要转正了哦,记得走转正流程!"); + break; + case "contract": + noticeType.setValue("合同提醒"); + content.setValue("有人合同已过期,请前往PC端查看!"); + } message.addData(noticeType); + message.addData(content); //发送人 MsgData publishMan = new MsgData(); @@ -101,57 +119,9 @@ public interface NoticeConvert { createTime.setValue(DateUtils.dateFormat(new Date(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)); message.addData(createTime); - //消息内容 - MsgData content = new MsgData(); - content.setName("thing2"); - content.setValue("今天有人过生日,请前往PC端查看!"); - message.addData(content); - message.setMiniprogramState(miniProgramState); message.setPage(""); return message; } - - /** - * 生日提醒 - * @param openId 微信小程序唯一id - * @param miniProgramState 小程序的状态 - * @return 提醒模板 - */ - default SubscribeMessageReqDTO convertRegular(String openId, String miniProgramState) { - - SubscribeMessageReqDTO message = new SubscribeMessageReqDTO(); - message.setToUser(openId); - message.setTemplateId("fH29xjNb8pe-7onQ-wE3QrBAC-y8aaC_oosYZKNMtzM"); - - //消息类型 - MsgData noticeType = new MsgData(); - noticeType.setName("phrase8"); - noticeType.setValue("转正提醒"); - message.addData(noticeType); - - //发送人 - MsgData publishMan = new MsgData(); - publishMan.setName("thing16"); - publishMan.setValue("系统"); - message.addData(publishMan); - - //发送时间 - MsgData createTime = new MsgData(); - createTime.setName("time3"); - createTime.setValue(DateUtils.dateFormat(new Date(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)); - message.addData(createTime); - - //消息内容 - MsgData content = new MsgData(); - content.setName("thing2"); - content.setValue("恭喜快要转正了哦,记得走转正流程!"); - message.addData(content); - - message.setMiniprogramState(miniProgramState); - message.setPage(""); - - return message; - } }