From a5d7dba43d64a1b37d481ebd8b5c24ddf9a9b77c Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Sun, 22 Sep 2024 15:46:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E9=80=9A=E7=9F=A5=E6=A8=A1=E6=9D=BF=E7=9A=84=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91=E3=80=82=E6=94=AF=E6=8C=81=E5=A4=9A?=
 =?UTF-8?q?=E7=A7=8D=E9=80=9A=E7=9F=A5=E7=B1=BB=E5=9E=8B(=E7=94=9F?=
 =?UTF-8?q?=E6=97=A5=E3=80=81=E8=BD=AC=E6=AD=A3=E3=80=81=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=8F=90=E9=86=92)=EF=BC=8C=E9=80=9A=E8=BF=87=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0type=E5=8C=BA=E5=88=86=E3=80=82=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E4=BA=86convertBirthday=E6=96=B9=E6=B3=95=EF=BC=8C=E6=95=B4?=
 =?UTF-8?q?=E5=90=88=E4=BA=86convertRegular=E6=96=B9=E6=B3=95=E3=80=82?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E4=BA=86=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?=
 =?UTF-8?q?=E6=80=A7=E5=92=8C=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/convert/notice/NoticeConvert.java  | 70 ++++++-------------
 1 file changed, 20 insertions(+), 50 deletions(-)

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;
-   }
 }