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 16:23:24 +08:00
parent 9b085b68a9
commit 3e0bfe8927
4 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java
+5
View File
@@ -1,5 +1,6 @@
package com.jero.common.dto;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import java.io.Serializable;
@@ -30,4 +31,8 @@ public class PaySendContactsMessageDTO implements Serializable {
* 条件 0为发送创建通知，1为发送缴费通知
*/
private String flag;
/**
* 前端需要的参数值
*/
private JSONObject json;
}
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
+5 -5
View File
@@ -45,11 +45,11 @@ public enum MessageUrlEnums {
C_OPEN_TYPE14("C_OPEN_TYPE14","component","MessagePage/ProjectDetailModal"),
C_OPEN_TYPE15("C_OPEN_TYPE15","component","MessagePage/ProjectDetailModal"),
C_OPEN_TYPE16("C_OPEN_TYPE16","component","MessagePage/ProjectDetailModal"),
C_OPEN_TYPE17("C_OPEN_TYPE17","url",""),
C_OPEN_TYPE18("C_OPEN_TYPE18","url",""),
C_OPEN_TYPE19("C_OPEN_TYPE19","url","/mineContract/MineContract"),
C_OPEN_TYPE20("C_OPEN_TYPE20","",""),
C_OPEN_TYPE21("C_OPEN_TYPE21","url","/mineContract/MineContract");
C_OPEN_TYPE17("C_OPEN_TYPE17","url","MessagePage/PaymentVoucher"),
C_OPEN_TYPE18("C_OPEN_TYPE18","url","MessagePage/PaymentVoucher"),
C_OPEN_TYPE19("C_OPEN_TYPE19","url","mineContract/MineContract"),
C_OPEN_TYPE20("C_OPEN_TYPE20","project",""),
C_OPEN_TYPE21("C_OPEN_TYPE21","url","mineContract/MineContract");
/**
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+15 -4
View File
@@ -1,5 +1,6 @@
package com.jero.payment.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.common.ProjectCommon;
@@ -258,9 +259,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
* @Date 2021/12/16 11:16
* @param projectId 项目id
* @param projectName 项目名称
* @param projectType 项目类型
* @return void
*/
private void uploadSendMessage(String projectId,String projectName){
private void uploadSendMessage(String projectId,String projectName,String projectType){
// 来款管理者给财务人员发送消息
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY));
if(!CollectionUtils.isEmpty(list)){
@@ -280,7 +282,11 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG15.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("M_OPEN_TYPE15");
// todo 跳转未填写
JSONObject json = new JSONObject();
json.put("projectId",projectId);
json.put("projectName",projectName);
json.put("projectType",projectType);
sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
});
}
@@ -292,9 +298,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
* @param userId 申请人id
* @param projectId 项目id
* @param projectName 项目名称
* @param projectType 项目类型
* @return void
*/
private void checkSendMessage(String userId,String projectId,String projectName){
private void checkSendMessage(String userId,String projectId,String projectName,String projectType){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser sysUserData = sysUserService.getById(userId);
if(!Objects.isNull(sysUserData)){
@@ -313,7 +320,11 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG18.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE18");
// todo 跳转未填写
JSONObject json = new JSONObject();
json.put("projectId",projectId);
json.put("projectName",projectName);
json.put("projectType",projectType);
sendMessageDTO.setBusId(json.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+6
View File
@@ -1,5 +1,6 @@
package com.jero.project.service.impl;
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;
@@ -150,6 +151,11 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
if(payCommonProject.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
}
JSONObject json = new JSONObject();
json.put("type",ProjectCommon.PROJECT_TYPE1);
json.put("id",payCommonProject.getId());
json.put("path","MessagePage/ProjectDetailModal");
paySendContactsMessageDTO.setJson(json);
contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO);
}
}