diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java index f35b769c..5d956b07 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/PaySendContactsMessageDTO.java @@ -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; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java index 96158196..ced6367c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java @@ -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"); /** 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 133bf969..72d4610e 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 @@ -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 list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.CWRY)); if(!CollectionUtils.isEmpty(list)){ @@ -280,7 +282,11 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl 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); } }