From 3e0bfe892732190c7d6605a49bc689487d941259 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Thu, 16 Dec 2021 16:23:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/dto/PaySendContactsMessageDTO.java |  5 +++++
 .../jero/common/enums/MessageUrlEnums.java    | 10 +++++-----
 .../impl/PayPaymentCheckServiceImpl.java      | 19 +++++++++++++++----
 .../impl/PayCommonProjectServiceImpl.java     |  6 ++++++
 4 files changed, 31 insertions(+), 9 deletions(-)

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<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);
         }
     }
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 324ffd1c..0593d32e 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
@@ -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);
         }
     }