From e224d8a24c90f10b388b5afc18717928b2c794b5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 26 Oct 2021 17:43:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2041435=20=E6=88=91=E7=9A=84=E6=B6=88?= =?UTF-8?q?=E6=81=AF--=E5=88=86=E6=A0=87=E5=A7=94=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE--=E6=94=B6=E5=88=B0=E7=9A=84=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=98=AF=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=B7=B2=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/SendMessageServiceImpl.java | 6 ++++-- .../controller/CommitteeMeetingController.java | 3 ++- .../meeting/controller/PayMeetingController.java | 12 ------------ .../controller/WorkGroupMeetingController.java | 3 ++- .../com/jero/meeting/service/IPayMeetingService.java | 4 ++-- .../meeting/service/impl/PayMeetingServiceImpl.java | 6 +++--- 6 files changed, 13 insertions(+), 21 deletions(-) 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 1132f415..931c7d32 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 @@ -77,12 +77,14 @@ public class SendMessageServiceImpl implements SendMessageService { if(!Objects.isNull(map)) { // 替换企业端系统url与小程序名称 // todo 替换系统地址，小程序名称 - if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) + if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode()) + ||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode()) - || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){ + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG13.getCode())){ map.put("systemAddress",env.getProperty("message.systemUrl")); map.put("wxName",env.getProperty("message.wxName")); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index e5234433..18afad05 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; @@ -331,7 +332,7 @@ public class CommitteeMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); + payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13,"C_OPEN_TYPE13"); return Result.OK(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 790c0d03..c0426799 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -426,18 +426,6 @@ public class PayMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); - return Result.OK(); - } - @ApiOperation(value = "生成base64") @GetMapping(value = "/createBase64") @ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index d04c169d..e59941c0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; @@ -332,7 +333,7 @@ public class WorkGroupMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO); + payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG1,"C_OPEN_TYPE1"); return Result.OK(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 6f2abb5c..9b05b720 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -3,6 +3,7 @@ package com.jero.meeting.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.enums.CompanyMessageEnums; import com.jero.meeting.entity.PayMeeting; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.meeting.vo.PayMeetingVO; @@ -61,9 +62,8 @@ public interface IPayMeetingService extends IService { * @param publishReminderVO * @author lijiarao * @date 2021/9/27 - * @return void */ - void publishReminder(PublishReminderVO publishReminderVO); + void publishReminder(PublishReminderVO publishReminderVO, CompanyMessageEnums companyMessageEnums, String busType); IPage pageListContract(Page page, QueryWrapper queryWrapper, String now); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index bca796ec..778bd0e3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -441,7 +441,7 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingIds = publishReminderVO.getMeetingIds(); List subitemIds = publishReminderVO.getSubitemIds(); Integer projectType = publishReminderVO.getProjectType(); @@ -532,9 +532,9 @@ public class PayMeetingServiceImpl extends ServiceImpl