LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息修改

Browse Source
This commit is contained in:
liangqitao
2021-12-16 11:48:25 +08:00
parent 932ec53891
commit 5ada5fa147
11 changed files with 139 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/service/ContractCreateProjectSendMessageService.java
+2 -2
View File
@@ -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);
}
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ContractCreateProjectSendMessageServiceImpl.java
+2 -2
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+7 -5
View File
@@ -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<PayCaseCom
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
return Result.OK("添加成功！");
}
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+13 -20
View File
@@ -1,18 +1,11 @@
package com.jero.data.controller;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.aspect.annotation.DictPoint;
@@ -20,37 +13,37 @@ import com.jero.common.common.ProjectCommon;
import com.jero.common.dto.PaySendContactsMessageDTO;
import com.jero.common.service.ContractCreateProjectSendMessageService;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.data.entity.*;
import com.jero.data.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.data.service.IPayCaseCouncilService;
import com.jero.data.service.IPayCaseCouncilSubitemService;
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.mail.commont.constant;
import com.jero.meeting.entity.PayMeetingRemindRecord;
import com.jero.meeting.service.IPayMeetingRemindRecordService;
import com.jero.modules.system.util.SecurityUtil;
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;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jetbrains.annotations.NotNull;
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 org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
/**
* @Description: 理事会成员
@@ -184,7 +177,7 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail());
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
return Result.OK("添加成功！");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+1 -1
View File
@@ -166,7 +166,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
// 收入合同创建项目发送消息到项目负责人
if (Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) {
PayMeeting payMeeting = meetingService.getById(meetingId1);
contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation1.getCompanyContactName(), payMeetingSituation1.getId(), payMeeting.getDirectorId());
contractCreateProjectSendMessageService.contractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation1.getCompanyContactName(), payMeetingSituation1.getId(), payMeeting.getDirectorId());
}
String meetingId = payMeetingSituation1.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+10 -13
View File
@@ -5,6 +5,7 @@ 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;
@@ -18,34 +19,30 @@ import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.member.entity.PayMemberProject;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.member.mapper.PayMemberProjectMapper;
import com.jero.member.mapper.PayMemberProjectSubitemMapper;
import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayCommonProject;
import com.jero.temporary.entity.PayCompanyManagementTemporary;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import com.jero.member.entity.PayMemberProject;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.member.mapper.PayMemberProjectSubitemMapper;
import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.valid.group.ChargeNotice;
import com.jero.valid.group.Contract;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
/**
* @Description: 会员项目成员表
@@ -128,7 +125,7 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
}
// 收入合同创建项目发送消息到项目负责人
if(Objects.equals(ProjectCommon.FLAG,payMemberProjectSubitem.getFlag())){
contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(memberProject.getProjectName() + "的" + payMemberProjectSubitem.getCompanyName(),payMemberProjectSubitem.getId(),memberProject.getDirectorId());
contractCreateProjectSendMessageService.contractCreateProjectSendMessageService(memberProject.getProjectName() + "的" + payMemberProjectSubitem.getCompanyName(),payMemberProjectSubitem.getId(),memberProject.getDirectorId());
}
// 新建项目 给企业联系人发送消息
PayContactsManagement payContactsManagement = contactsManagementService.getById(payMemberProjectSubitem.getCompanyContactId());
@@ -143,7 +140,7 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
if(payMemberProjectSubitem.getAmountReceivable().compareTo(new BigDecimal("0")) > 0){
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
}
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+85 -1
View File
@@ -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<PayPaymentCheckMappe
private PayMemberProjectSubitemMapper payMemberProjectSubitemMapper;
@Resource
private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper;
@Resource
private Environment env;
@Resource
private ISysUserService sysUserService;
@Resource
private SendMessageService sendMessageService;
/**
* 申请
@@ -144,6 +164,70 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
payPaymentCheckMapper.insert(payPaymentRecordSub);
}
/**
* @Description 企业人员上传完汇款凭证之后 来款管理者 给财务人员 发送消息
* @Date 2021/12/16 11:16
* @param projectId 项目id
* @param projectName 项目名称
* @return void
*/
private void uploadSendMessage(String projectId,String projectName){
// 来款管理者给财务人员发送消息
List<SysUser> 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<String,String> 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<String,String> 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);
}
}
/**
* 审核
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+2 -2
View File
@@ -133,7 +133,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
}
// 收入合同创建项目发送消息到项目负责人
if(Objects.equals(ProjectCommon.FLAG,payCommonProject.getFlag())){
contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payCommonProject.getChargeProject(),payCommonProject.getId(),payCommonProject.getPrincipalId());
contractCreateProjectSendMessageService.contractCreateProjectSendMessageService(payCommonProject.getChargeProject(),payCommonProject.getId(),payCommonProject.getPrincipalId());
}
// 新建项目 给企业联系人发送消息
PayContactsManagement payContactsManagement = payContactsManagementService.getById(payCommonProject.getContactsId());
@@ -149,7 +149,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
if(payCommonProject.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
}
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+6 -13
View File
@@ -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<PayWorkingGroupMappe
paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA());
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG1);
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}
// 新建项目 给企业联系人2发送消息
@@ -352,7 +345,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA());
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG1);
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}
// 新建项目 给企业联系人3发送消息
@@ -366,7 +359,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA());
paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone());
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG1);
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+11 -8
View File
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.jero.common.api.vo.Result;
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;
@@ -29,10 +29,13 @@ import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.payment.service.IPayPaymentCheckService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.*;
import com.jero.project.entity.PayWorkGroupSubletStatistics;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.entity.PayWorkingGroupSubletSearch;
import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
import com.jero.project.vo.SetChargeInput;
import com.jero.temporary.entity.PayCompanyManagementTemporary;
import com.jero.temporary.entity.PayContactsManagementTemporary;
@@ -46,10 +49,10 @@ import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
@@ -185,7 +188,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
}
// 收入合同创建项目发送消息到项目负责人
if(Objects.equals(ProjectCommon.FLAG,payWorkingGroupSubItem.getFlag())){
contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payWorkingGroup.getWorkingGroupProject() + "的" + payWorkingGroupSubItem.getChargeCompanyTemporaryName(),payWorkingGroupSubItem.getId(),payWorkingGroup.getPrincipalIdA());
contractCreateProjectSendMessageService.contractCreateProjectSendMessageService(payWorkingGroup.getWorkingGroupProject() + "的" + payWorkingGroupSubItem.getChargeCompanyTemporaryName(),payWorkingGroupSubItem.getId(),payWorkingGroup.getPrincipalIdA());
}
// 新建项目 给企业联系人1发送消息
if(!StringUtils.isBlank(payWorkingGroupSubItem.getContactsIdOne())){
@@ -202,7 +205,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
}
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}
// 新建项目 给企业联系人2发送消息
@@ -220,7 +223,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
}
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}
// 新建项目 给企业联系人3发送消息
@@ -238,7 +241,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
if(payWorkingGroupSubItem.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
}
contractCreateProjectSendMessageService.CreateProjectSendMessageToContactsService(paySendContactsMessageDTO);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java
-1
View File
@@ -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);