diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java index 54c2e513..ecc43a99 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java @@ -13,7 +13,7 @@ public interface ContractCreateProjectSendMessageService { * @Return * @Exception */ - void ContractCreateProjectSendMessageService(String projectName,String projectId,String userId); + void contractCreateProjectSendMessageService(String projectName, String projectId, String userId); /** * @Description 创建项目发送消息，通知企业联系人 * @Author lqt @@ -22,5 +22,5 @@ public interface ContractCreateProjectSendMessageService { * @Return * @Exception */ - void CreateProjectSendMessageToContactsService(PaySendContactsMessageDTO paySendContactsMessageDTO); + void createProjectSendMessageToContactsService(PaySendContactsMessageDTO paySendContactsMessageDTO); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java index 18bd69c6..2e313c7c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java @@ -28,7 +28,7 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea private SendMessageService sendMessageService; @Override - public void ContractCreateProjectSendMessageService(String projectName,String projectId,String userId) { + public void contractCreateProjectSendMessageService(String projectName,String projectId,String userId) { if(StringUtils.isEmpty(userId)){ return; } @@ -59,7 +59,7 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea } @Override - public void CreateProjectSendMessageToContactsService(PaySendContactsMessageDTO paySendContactsMessageDTO) { + public void createProjectSendMessageToContactsService(PaySendContactsMessageDTO paySendContactsMessageDTO) { if(StringUtils.isBlank(paySendContactsMessageDTO.getFlag())){ return; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index 1e9f4f37..0d7c0872 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -1,6 +1,4 @@ package com.jero.data.controller; -import java.util.*; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -29,6 +27,8 @@ import com.jero.meeting.entity.PayMeetingRemindRecord; import com.jero.meeting.service.IPayMeetingRemindRecordService; import com.jero.project.common.PayProjectCommon; import com.jero.util.AmountUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.SecurityUtils; @@ -38,12 +38,14 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; /** @@ -272,7 +274,7 @@ public class PayCaseCommitteeSubitemController extends JeroController 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } - contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO); + contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 5b445a18..d3badc99 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -3,9 +3,15 @@ package com.jero.payment.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.common.ProjectCommon; +import com.jero.common.common.RoleCommon; +import com.jero.common.dto.SendMessageDTO; +import com.jero.common.enums.CompanyMessageEnums; +import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.SendMessageService; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PasswordUtil; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingSituationMapper; @@ -13,8 +19,10 @@ import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.member.mapper.TbMemberProjectSubitemMapper; -import com.jero.payment.entity.PayPaymentRecordSub; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.payment.entity.PayPaymentRecord; +import com.jero.payment.entity.PayPaymentRecordSub; import com.jero.payment.mapper.PayPaymentCheckMapper; import com.jero.payment.mapper.PayPaymentRecordMapper; import com.jero.payment.service.IPayPaymentCheckService; @@ -23,15 +31,21 @@ import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Objects; /** * 到账审核 @@ -55,6 +69,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(item->{ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(item.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail())); + } + if(!StringUtils.isEmpty(item.getPhone())){ + sendMessageDTO.setPhone(PasswordUtil.decrypt(item.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("projectName",projectName); + sendMessageDTO.setFromUser(env.getProperty("message.systemEmailUser")); + sendMessageDTO.setToUser(item.getUsername()); + sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG15.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("M_OPEN_TYPE15"); + // todo 跳转未填写 + sendMessageService.SendMessageService(sendMessageDTO); + }); + } + } + + /** + * @Description 汇款凭证审核不通过 审核人 给申请人发送消息 + * @Date 2021/12/16 11:34 + * @param userId 申请人id + * @param projectId 项目id + * @param projectName 项目名称 + * @return void + */ + private void checkSendMessage(String userId,String projectId,String projectName){ + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysUser sysUserData = sysUserService.getById(userId); + if(!Objects.isNull(sysUserData)){ + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if(!StringUtils.isBlank(sysUserData.getEmail())){ + sendMessageDTO.setEmail(PasswordUtil.decrypt(sysUserData.getEmail())); + } + if(!StringUtils.isEmpty(sysUserData.getPhone())){ + sendMessageDTO.setPhone(PasswordUtil.decrypt(sysUserData.getPhone())); + sendMessageDTO.setToUser(PasswordUtil.decrypt(sysUserData.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("projectName",projectName); + sendMessageDTO.setFromUser(sysUser.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG18.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("C_OPEN_TYPE18"); + // todo 跳转未填写 + sendMessageService.SendMessageService(sendMessageDTO); + } + } /** * 审核 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 78a03f9d..f54db85d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -133,7 +133,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } - contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO); + contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index f3b516d5..8441c76b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -1,33 +1,30 @@ package com.jero.project.service.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.common.ProjectCommon; import com.jero.common.dto.PaySendContactsMessageDTO; import com.jero.common.exception.JeroBootException; import com.jero.common.service.ContractCreateProjectSendMessageService; import com.jero.common.service.RolePermissionService; import com.jero.common.system.vo.LoginUser; -import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; -import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.*; +import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.project.service.IPayResearchProjectService; +import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.project.vo.PayWorkingGroupVO; -import com.jero.project.service.IPayWorkingGroupService; -import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.statistics.entity.*; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; @@ -37,11 +34,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -338,7 +331,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } - contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO); + contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } } // 新建项目 给企业联系人2发送消息 @@ -220,7 +223,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } - contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO); + contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } } // 新建项目 给企业联系人3发送消息 @@ -238,7 +241,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } - contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO); + contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java index f18b656d..8dfce3f1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java @@ -72,7 +72,6 @@ public class SystemSendMessageController { listPayContactsManagement.parallelStream().forEach(p->{ try { String toUser = PasswordUtil.decrypt(p.getPhone()); - SysAnnouncement announcement = new SysAnnouncement(); announcement.setTitile(ProjectCommon.ALERT12); announcement.setMsgContent(content);