From d10151f66726a2f80fa6e2c3b71084b123fe2182 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 13 Mar 2024 09:07:24 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=AF=8F=E6=9C=881=E5=8F=B7=E5=8F=91?= =?UTF-8?q?=E9=80=81=E4=BC=9A=E5=91=98=E5=88=B0=E6=9C=9F=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年2月变更.sql | 7 +++ .../common/enums/ManagementMessageEnums.java | 7 ++- .../service/impl/SendMessageServiceImpl.java | 3 + .../xml/TbMemberProjectSubitemMapper.xml | 1 + .../TbMemberProjectSubitemServiceImpl.java | 2 + .../com/jero/quartz/job/MemberProjectJob.java | 59 ++++++++++++++++++- 6 files changed, 75 insertions(+), 4 deletions(-) diff --git a/db/24年2月变更.sql b/db/24年2月变更.sql index 1a09c816..61fc48f2 100644 --- a/db/24年2月变更.sql +++ b/db/24年2月变更.sql @@ -68,3 +68,10 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1767089980854767618', '1435541165297995778', '打包项目', '8', '', 8, 1, 'chh', '2024-03-11 15:27:37' ) -- 字典来款用途新增打包 INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1767090351832567809', '1431145150766923778', '打包', '22', '', 22, 1, 'chh', '2024-03-11 15:29:05' ) +# 会员到期提醒消息模板 +INSERT INTO sys_sms_template ( id, template_code, template_name, template_content, template_type, recipient, create_by, create_time ) VALUES ( '1767384966368137217', 'GL_16_HTTZ_EXPIRE', '15', '

【中汽标协】尊敬的会员朋友，您的会员权限将于${expiredDay}到期，请及时续费，以免影响您的会员权益。

', '2,3', '1', 'LKGLZ', '2024-03-12 10:59:47' ); +# 处理历史数据 +update income_payments.tb_member_project_subitem tmps + left join standards_association.tb_member_info tmi on tmps.company_name = tmi.company_name +set tmps.effective_date = tmi.effective_date, tmps.invalidation_date = tmi.invalidation_date +where 1=1; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java index c048af58..e2fc3197 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/ManagementMessageEnums.java @@ -10,7 +10,9 @@ import org.apache.commons.lang3.StringUtils; * @Exception */ public enum ManagementMessageEnums { - + /** + * + */ MSG1("GL_1_HTTZ_CREATE_PROJECT","项目通知","projectName"),// 查看详情,projectName MSG2("GL_2_HTTZ_SUBMIT","合同通知","contractNum,contractName"),// 跳转到合同的详情页面,contractNum,contractName MSG3("GL_3_HTTZ_AUDIT","合同通知","contractNum,contractName"),//跳转到合同的详情页面,contractNum,contractName @@ -26,7 +28,8 @@ public enum ManagementMessageEnums { MSG13("GL_13_YJTZ_PJ_CREATE","邮寄通知","projectName"),//查看该项目详情， projectName MSG14("GL_14_YJTZ_HT_CREATE","邮寄通知","contractName,contractNum"),//跳转到合同的详情页面， contractNum,contractName MSG15("GL_15_XMTZ_UPLOAD_VOUCHER","项目通知","projectName"),//审核弹窗 projectName - MSG16("GL_16_HTTZ_HT_CANCELLATION","合同通知","contractNum,contractName");//合同详情页面 + MSG16("GL_16_HTTZ_HT_CANCELLATION","合同通知","contractNum,contractName"),//合同详情页面 + MSG17("GL_16_HTTZ_EXPIRE","会员到期通知","expiredDay");//会员到期通知 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 6cf91a10..dd64f37c 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 @@ -101,6 +101,9 @@ public class SendMessageServiceImpl implements SendMessageService { // 1短信 2邮件 3系统 // 发送邮件 true String fromUser = sendMessageDTO.getFromUser(); + if (StringUtils.isBlank(fromUser)){ + fromUser = env.getProperty("message.systemEmailUser"); + } Integer sendEmailFlag = sendMessageDTO.getSendEmailFlag(); LoginUser loginUser = sysBaseAPI.getUserByName(fromUser); if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml index f653720d..cbc9d98b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml @@ -100,6 +100,7 @@ LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id tmps.company_id = #{companyId} + and tmps.effective_date is not null \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java index 424a3359..725ac834 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java @@ -386,6 +386,8 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("MONTH(invalidation_date)",month) + .eq("YEAR(invalidation_date)",year); + List list = memberProjectSubitemService.list(wrapper); + for (TbMemberProjectSubitem tbMemberProjectSubitem : list) { + String companyId = tbMemberProjectSubitem.getCompanyId(); + TbMemberProjectSubitem takeEffectInfo = memberProjectSubitemService.getTakeEffectInfo(companyId); + if (!takeEffectInfo.getId().equals(tbMemberProjectSubitem.getId())) { + continue; + } + String liaisonManId = tbMemberProjectSubitem.getLiaisonManId(); + PayContactsManagement p = payContactsManagementService.getById(liaisonManId); + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(p.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + if(!StringUtils.isEmpty(p.getPhone())){ + sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone())); + sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("expiredDay",offset.toString(FORMAT)); + sendMessageDTO.setFromUser(null); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG17.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageService.SendMessageService(sendMessageDTO); + } } }