diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java index 2a87b1ed..9c00d443 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java @@ -14,25 +14,29 @@ public class ProjectCommon { */ public final static Integer PACKAGING1 = 1; /** - * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目) + * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书) */ public final static String PROJECT_TYPE1 = "1"; /** - * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目) + * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书) */ public final static String PROJECT_TYPE2 = "2"; /** - * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目) + * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书) */ public final static String PROJECT_TYPE3 = "3"; /** - * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目) + * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书) */ public final static String PROJECT_TYPE4 = "4"; /** - * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目) + * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书) */ public final static String PROJECT_TYPE5 = "5"; + /** + * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书) + */ + public final static String PROJECT_TYPE6 = "6"; /** * 来源(1:收入合同,2:打包管理) */ 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 2e313c7c..18a7affb 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 @@ -87,9 +87,9 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG20.getCode()); sendMessageDTO.setTemplateParam(map); sendMessageDTO.setBusType("C_OPEN_TYPE20"); - JSONObject json = new JSONObject(); - json.put("id",paySendContactsMessageDTO.getProjectId()); - sendMessageDTO.setBusId(json.toJSONString()); + if(!Objects.isNull(paySendContactsMessageDTO.getJson())){ + sendMessageDTO.setBusId(paySendContactsMessageDTO.getJson().toJSONString()); + } sendMessageService.SendMessageService(sendMessageDTO); } // 发送缴费通知 @@ -110,8 +110,9 @@ public class ContractCreateProjectSendMessageServiceImpl implements ContractCrea sendMessageDTO.setTemplateParam(map); sendMessageDTO.setBusType("C_OPEN_TYPE17"); JSONObject json = new JSONObject(); - json.put("id",paySendContactsMessageDTO.getProjectId()); - sendMessageDTO.setBusId(json.toJSONString()); + if(!Objects.isNull(paySendContactsMessageDTO.getJson())){ + sendMessageDTO.setBusId(paySendContactsMessageDTO.getJson().toJSONString()); + } sendMessageService.SendMessageService(sendMessageDTO); } } 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 0d7c0872..976776d4 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,4 +1,5 @@ package com.jero.data.controller; +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.metadata.IPage; @@ -274,6 +275,11 @@ public class PayCaseCommitteeSubitemController extends JeroController 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } + JSONObject json = new JSONObject(); + json.put("type",ProjectCommon.PROJECT_TYPE4); + json.put("id",payMemberProjectSubitem.getId()); + json.put("path","MessagePage/ProjectDetailModal"); + paySendContactsMessageDTO.setJson(json); 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 8441c76b..962406c8 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,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; @@ -159,7 +160,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl{ - // 项目的应收金额>0 发送缴费通知 - if(p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0) { - // 新建项目 给企业联系人1发送消息 - if (!StringUtils.isBlank(p.getContactsIdOne())) { - PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdOne()); - if (!Objects.isNull(payContactsManagement)) { - PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO(); - paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject()); - paySendContactsMessageDTO.setProjectId(p.getId()); - paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail()); - paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA()); - paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone()); - paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG1); - contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); + JSONObject json = new JSONObject(); + json.put("type",ProjectCommon.PROJECT_TYPE2); + json.put("id",p.getId()); + json.put("path","workTeam/WorkTeamDetail"); + // 新建项目 给企业联系人1发送消息 + if (!StringUtils.isBlank(p.getContactsIdOne())) { + PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdOne()); + if (!Objects.isNull(payContactsManagement)) { + PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO(); + paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject()); + paySendContactsMessageDTO.setProjectId(p.getId()); + paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail()); + paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA()); + paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone()); + paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0); + // 项目的应收金额>0 发送缴费通知 + if(!Objects.isNull(p.getReceivableAmount()) && p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){ + paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } + paySendContactsMessageDTO.setJson(json); + contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } - // 新建项目 给企业联系人2发送消息 - if (!StringUtils.isBlank(p.getContactsIdTwo())) { - PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdTwo()); - if (!Objects.isNull(payContactsManagement)) { - PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO(); - paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject()); - paySendContactsMessageDTO.setProjectId(p.getId()); - paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail()); - paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA()); - paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone()); - paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG1); - contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); + } + // 新建项目 给企业联系人2发送消息 + if (!StringUtils.isBlank(p.getContactsIdTwo())) { + PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdTwo()); + if (!Objects.isNull(payContactsManagement)) { + PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO(); + paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject()); + paySendContactsMessageDTO.setProjectId(p.getId()); + paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail()); + paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA()); + paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone()); + paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0); + // 项目的应收金额>0 发送缴费通知 + if(!Objects.isNull(p.getReceivableAmount()) && p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){ + paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } + paySendContactsMessageDTO.setJson(json); + contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } - // 新建项目 给企业联系人3发送消息 - if (!StringUtils.isBlank(p.getContactsIdThree())) { - PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdThree()); - if (!Objects.isNull(payContactsManagement)) { - PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO(); - paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject()); - paySendContactsMessageDTO.setProjectId(p.getId()); - paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail()); - paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA()); - paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone()); - paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG1); - contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); + } + // 新建项目 给企业联系人3发送消息 + if (!StringUtils.isBlank(p.getContactsIdThree())) { + PayContactsManagement payContactsManagement = payContactsManagementService.getById(p.getContactsIdThree()); + if (!Objects.isNull(payContactsManagement)) { + PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO(); + paySendContactsMessageDTO.setProjectName(payWorkingGroupOld.getWorkingGroupProject()); + paySendContactsMessageDTO.setProjectId(p.getId()); + paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail()); + paySendContactsMessageDTO.setUserId(payWorkingGroupOld.getPrincipalIdA()); + paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone()); + paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0); + // 项目的应收金额>0 发送缴费通知 + if(!Objects.isNull(p.getReceivableAmount()) && p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){ + paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } + paySendContactsMessageDTO.setJson(json); + contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } } }); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index f50beef6..23570461 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -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.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -190,6 +191,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } + paySendContactsMessageDTO.setJson(json); contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } } @@ -223,6 +229,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } + paySendContactsMessageDTO.setJson(json); contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } } @@ -241,6 +248,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } + paySendContactsMessageDTO.setJson(json); contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); } }