From 9a522efc18d22cf84ab6e3fd76e464806fe3c3ab Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 1 Nov 2023 13:56:43 +0800 Subject: [PATCH] =?UTF-8?q?add=20Wasic=E5=9B=BD=E9=99=85=E7=A0=94=E8=AE=A8?= =?UTF-8?q?=E4=BC=9A=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=90=8D=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年10月23日变更.sql | 7 + .../com/jero/common/util/HuaWeiSmsUtil.java | 12 +- .../common/enums/CompanyMessageEnums.java | 4 +- .../service/impl/SendMessageServiceImpl.java | 162 +++++++++--------- .../impl/PayMeetingSituationServiceImpl.java | 35 ++++ 5 files changed, 135 insertions(+), 85 deletions(-) diff --git a/db/23年10月23日变更.sql b/db/23年10月23日变更.sql index 0818a157..b29e9cab 100644 --- a/db/23年10月23日变更.sql +++ b/db/23年10月23日变更.sql @@ -16,3 +16,10 @@ INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `descrip INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1716349372095889410', '1716348751477309441', '国际发展论坛', '6', '', 2.00, 1, 'LKGLZ', '2023-10-23 15:02:33', NULL, NULL); INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1717361269014310914', '1716348751477309441', '114/22焦点论坛', '99', '需要默认选中参与的费用', 1.00, 1, 'LKGLZ', '2023-10-26 10:03:28', NULL, NULL); INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1717460651105628162', '1716348751477309441', '小型智能车专题', '7', '', 8.00, 1, 'LKGLZ', '2023-10-26 16:38:23', NULL, NULL); + +INSERT INTO `sys_sms_template` (`id`, `template_name`, `template_code`, `recipient`, `template_type`, + `template_content`, `template_test_json`, `create_time`, `create_by`, `update_time`, + `update_by`) +VALUES ('1719550569588023297', '3', 'QY_24_HYTZ_MEETING_SIGN_UP', 2, '1', + '

尊敬的${realname}您好，感谢您注册报名参加2023世界汽车标准创新大会（WASIC），大会将于11月26日-28日在深圳市坪山区格兰云天酒店召开，详情请登陆http://www.catarc.org.cn/wasic.html，期待您的莅临！

', + NULL, '2023-11-01 11:40:57', 'admin', NULL, NULL); diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/HuaWeiSmsUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/HuaWeiSmsUtil.java index 8199fb83..0efabe78 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/HuaWeiSmsUtil.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/HuaWeiSmsUtil.java @@ -92,23 +92,23 @@ public class HuaWeiSmsUtil { } switch (codeType) { case "1": - // 中汽中心标准所-登录验证码内容 + // 中汽中心标准院-登录验证码内容 sender = "8821092414481"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "93c8a63236734e0ca0bc89f8b2413e7f"; templateParas = "[" + randomNumber + "]"; break; case "2": - // 中汽中心标准所-忘记密码 + // 中汽中心标准院-忘记密码 sender = "8821092414481"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "ac6749d4a3134c39997b4342695ddc01"; templateParas = "[" + randomNumber +"]"; break; case "3": - // 中汽中心标准所-注册 + // 中汽中心标准院-注册 sender = "8821092414481"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "98a9d61b7d41423aa7a7d4ac969c4e6a"; templateParas = "[" + randomNumber +"]"; break; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java index 704eb6c6..9e03e128 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java @@ -34,7 +34,9 @@ public enum CompanyMessageEnums { MSG20("QY_20_HYTZ_NOT_AUDIT_CREATE","项目通知","projectName,"),//项目详情页/弹框 projectName MSG21("QY_21_HYTZ_NOT_AUDIT_CREATE","合同通知","contractNum,contractName"),//合同列表页 contractNum,contractName 对应原型的序号19 MSG22("QY_22_WJTZ_DEND_FILE","文件通知","projectName"),// 弹窗：查看该项目详情，projectName - MSG23("QY_23_WJTZ_FILE_EDIT","文件通知","year");// 进入收费通知的页面 + MSG23("QY_23_WJTZ_FILE_EDIT","文件通知","year"),// 进入收费通知的页面 + MSG24("QY_24_HYTZ_MEETING_SIGN_UP","会议通知","realname"),// WASIC会议报名成功通知 + ; private String code; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index cda38368..2b41eee3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -250,238 +250,244 @@ public class SendMessageServiceImpl implements SendMessageService { String codeType = sendMessageDTO.getTemplateCode(); switch (codeType) { case "GL_1_HTTZ_CREATE_PROJECT": - //中汽中心标准所-管理端-项目通知-1 + //中汽中心标准院-管理端-项目通知-1 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "cf45faeaf239406ab625738e09f5327e"; //通知类短信，不需要存redis break; case "GL_2_HTTZ_SUBMIT": - //中汽中心标准所-管理端-合同通知-2 + //中汽中心标准院-管理端-合同通知-2 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "2d7d0a8ed3c84dafb4d3a883e0427177"; break; case "GL_3_HTTZ_AUDIT": - //中汽中心标准所-管理端-合同通知-3 + //中汽中心标准院-管理端-合同通知-3 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "7d1eada05b3f4b1b8f4e896141ad1c96"; break; case "GL_4_HTTZ_NOT_AUDIT": - //中汽中心标准所-管理端-合同通知-4 + //中汽中心标准院-管理端-合同通知-4 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "fd9659e57ec74022b67925a9bd02c6c0"; //通知类短信，不需要存redis break; case "GL_5_HYTZ_SIGN_UP_UPLOAD": - // 中汽中心标准所-管理端-会议通知-5 + // 中汽中心标准院-管理端-会议通知-5 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "ef7374b862e3442e9ea6f84c3e626e9c"; break; case "GL_6_DBTZ_ADD": - // 中汽中心标准所-管理端-打包通知-6 + // 中汽中心标准院-管理端-打包通知-6 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "03f3a87f06d047079da27ef9cb3c2121"; break; case "GL_7_DBTZ_CONTRACT": - //中汽中心标准所-管理端-打包通知-7 + //中汽中心标准院-管理端-打包通知-7 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "ae2e2957653b48f98279cfccf9a8f1b2"; //通知类短信，不需要存redis break; case "GL_8_HYTZ_ON_ACCESS_UPDATE": - // 中汽中心标准所-管理端-会议通知-8 + // 中汽中心标准院-管理端-会议通知-8 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "6a882eaa16d8495da9521440f42f935f"; break; case "GL_9_QYTZ_CREATE": - //中汽中心标准所-管理端-企业通知-9 + //中汽中心标准院-管理端-企业通知-9 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "1b9dd79bb217420fa25725feb1ffaef4"; break; case "GL_10_HYTZ_CREATE": - //中汽中心标准所-管理端-会议通知-10 + //中汽中心标准院-管理端-会议通知-10 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "c842206392b944998bf9dd2742570931"; break; case "GL_11_DZTZ_DZ_CREATE": - //中汽中心标准所-管理端-到账通知-11 + //中汽中心标准院-管理端-到账通知-11 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "908238343aa94bab9d3921f77e98431d"; break; case "GL_12_KPTZ_KP_CREATE": - //中汽中心标准所-管理端-开票通知-12 + //中汽中心标准院-管理端-开票通知-12 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "626041c1823240b99f7aad68aa2bd9ec"; break; case "GL_13_YJTZ_PJ_CREATE": - //中汽中心标准所-管理端-邮寄通知-13 + //中汽中心标准院-管理端-邮寄通知-13 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "b933c487581146f38a7a7bf306b8aa0e"; break; case "GL_14_YJTZ_HT_CREATE": - //中汽中心标准所-管理端-邮寄通知-14 + //中汽中心标准院-管理端-邮寄通知-14 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "6f054af3cfc345168e1e2e3cbf03403b"; break; case "GL_15_XMTZ_UPLOAD_VOUCHER": - //中汽中心标准所-管理端-项目通知-15 + //中汽中心标准院-管理端-项目通知-15 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "c90ee6f41349451c959285a01ebaaf73"; break; case "GL_16_HTTZ_HT_CANCELLATION": - //中汽中心标准所-管理端-合同通知-16 + //中汽中心标准院-管理端-合同通知-16 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "5c8f7a24fe1d4611b296fd942bea88a1"; break; case "QY_1_HYTZ_WORK_GROUP_CREATE": - //中汽中心标准所-企业端-会议通知-1 + //中汽中心标准院-企业端-会议通知-1 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "8f47ff24c3bb47eebc34a1f30dd11e8b"; //通知类短信，不需要存redis break; case "QY_2_HYTZ_WORK_GROUP_SIGN_UP": - //中汽中心标准所-企业端-会议通知-2 + //中汽中心标准院-企业端-会议通知-2 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "7bb409f0bacf476390b5c8298df53e4b"; //todo 审核不通过 break; case "QY_3_HYTZ_WORK_GROUP_UPLOAD": - //中汽中心标准所-企业端-会议通知-3 + //中汽中心标准院-企业端-会议通知-3 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "b7742cdb2c524f3d8d08deb3d32f2d57";//todo 审核不通过 break; case "QY_4_HYTZ_WORK_GROUP_NOT_UPLOAD": - //中汽中心标准所-企业端-会议通知-4 + //中汽中心标准院-企业端-会议通知-4 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "4829c9fae6df47c881475672e186a497";//todo 审核不通过 //通知类短信，不需要存redis break; case "QY_5_HYTZ_NOT_AUDIT": - //中汽中心标准所-企业端-会议通知-5 + //中汽中心标准院-企业端-会议通知-5 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "80fb7c389b8d4b4b8fd2e72d8b6ad126"; break; case "QY_6_HYTZ_AUDIT": - //中汽中心标准所-企业端-会议通知-6 + //中汽中心标准院-企业端-会议通知-6 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "88e6b8880be640c8b7c91b9dbe0a7a85";//todo 审核不通过 break; case "QY_7_WJTZ_MEETING_SEND": - //中汽中心标准所-企业端-文件通知-7 + //中汽中心标准院-企业端-文件通知-7 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "2238fbb4e3fd4ff68bb47e872e7c9a05";//todo 审核不通过 //通知类短信，不需要存redis break; case "QY_8_HTTZ_PHASE": - //中汽中心标准所-企业端-合同通知-8 + //中汽中心标准院-企业端-合同通知-8 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "891d3236a8034a0c8ef266bb287a9ffa"; break; case "QY_9_YJTZ_MAIL": - //中汽中心标准所-企业端-邮寄通知-9 + //中汽中心标准院-企业端-邮寄通知-9 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "d73c9158ae274108a32f95d9efea758b"; break; case "QY_10_YJTZ_MAIL_CONTRACT": - // 中汽中心标准所-企业端-邮寄通知-10 + // 中汽中心标准院-企业端-邮寄通知-10 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "ffb8e25b55ef45be9e93c0026e581f95"; //通知类短信，不需要存redis break; case "QY_11_CKTZ_PAY": - // 中汽中心标准所-企业端-催款通知-1 + // 中汽中心标准院-企业端-催款通知-1 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "518b44718fb6403094f7d3e7b1fb6555"; break; case "QY_12_WJTZ_WORK_GROUP_SEND": - //中汽中心标准所-企业端-文件通知-12 + //中汽中心标准院-企业端-文件通知-12 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "e1a089109aaa4820927d488613171b54"; break; case "QY_13_HYTZ_FBW_CREATE": - //中汽中心标准所-企业端-缴费通知-13 + //中汽中心标准院-企业端-缴费通知-13 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "926e49e09008438b88d80849fe9f5bbb"; break; case "QY_14_JFTZ_DZ_CREATE": - //中汽中心标准所-企业端-缴费通知-14 + //中汽中心标准院-企业端-缴费通知-14 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "5c6ae4c97da44664aafbc5c7a2a937e8"; break; case "QY_15_KPTZ_KP_CREATE": - //中汽中心标准所-企业端-开票通知-15 + //中汽中心标准院-企业端-开票通知-15 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "e73af5dfa0ec44bf8ca20576b6fc7f77"; break; case "QY_16_HYTZ_NOT_AUDIT_CREATE": - //中汽中心标准所-企业端-会议通知-16 + //中汽中心标准院-企业端-会议通知-16 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "54d0f666c03f4de7ac9d9ac87fa60f4c"; break; case "QY_17_JFTZ_UPLOAD_VOUCHER": - //中汽中心标准所-企业端-缴费通知-17 + //中汽中心标准院-企业端-缴费通知-17 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "b84b4c425dae4d39b0ae14cd1fbe83c6"; break; case "QY_18_JFTZ_VOUCHER_CHECK": - //中汽中心标准所-企业端-缴费通知-18 + //中汽中心标准院-企业端-缴费通知-18 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "365c477feb2f4e7b96a0344984627994"; break; case "QY_19_HYTZ_CANCELLATION": - // 中汽中心标准所-企业端-合同通知-19 + // 中汽中心标准院-企业端-合同通知-19 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "572fb0a9da684bf6a47a530e5be467e0"; break; case "QY_20_HYTZ_NOT_AUDIT_CREATE": - // 中汽中心标准所-企业端-项目通知-20 + // 中汽中心标准院-企业端-项目通知-20 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "fc2838a86f794d1891a3d4ce1ff9139e"; break; case "QY_21_HYTZ_NOT_AUDIT_CREATE": - // 中汽中心标准所-企业端-合同通知-21 + // 中汽中心标准院-企业端-合同通知-21 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "c6608053b3a2482bb3db7c00820bbd4a"; break; case "QY_22_WJTZ_DEND_FILE": - // 中汽中心标准所-企业端-文件通知-22 + // 中汽中心标准院-企业端-文件通知-22 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; + templateId = "1dfe235047184c3a9c8d7b5652b6b635"; + break; + case "QY_24_HYTZ_MEETING_SIGN_UP": + // 中汽中心标准院-企业端-会议通知-24 + sender = "8821092414406"; + signature = "中汽中心标准院"; templateId = "1dfe235047184c3a9c8d7b5652b6b635"; break; default: @@ -656,9 +662,9 @@ public class SendMessageServiceImpl implements SendMessageService { String codeType = sendMessageDTO.getTemplateCode(); switch (codeType) { case "QY_11_CKTZ_PAY": - // 中汽中心标准所-企业端-催款通知-1 + // 中汽中心标准院-企业端-催款通知-1 sender = "8821092414406"; - signature = "中汽中心标准所"; + signature = "中汽中心标准院"; templateId = "518b44718fb6403094f7d3e7b1fb6555"; break; default: diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 44b58151..91bd0cd7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -234,6 +234,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("realname", contactsManagement.getName()); + sendMessageDTO.setFromUser(payMeeting.getDirectorName()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG24.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageService.SendMessageService(sendMessageDTO); + } /** * 审核