From 138b3257ada7abe6814d323f97dccade5eadd142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Sat, 9 Oct 2021 19:03:55 +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

---
 .../jero/common/enums/MessageUrlEnums.java    |  4 +--
 .../PayWorkingGroupDistributionRecord.java    |  6 ++++
 ...ingGroupDistributionRecordServiceImpl.java | 35 ++++++++++++++++---
 3 files changed, 39 insertions(+), 6 deletions(-)

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 68c29123..eb3a483d 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
@@ -29,8 +29,8 @@ public enum MessageUrlEnums {
     C_OPEN_TYPE5("C_OPEN_TYPE5","component","MessagePage/UploadMeetingCertificateModal"),
     C_OPEN_TYPE6("C_OPEN_TYPE6","component","MessagePage/MeetingDetailModal"),
     C_OPEN_TYPE7("C_OPEN_TYPE7","component","MessagePage/MeetingDetailModal"),
-    C_OPEN_TYPE8("C_OPEN_TYPE8","none",""),
-    C_OPEN_TYPE9("C_OPEN_TYPE9","",""),
+    C_OPEN_TYPE8("C_OPEN_TYPE8","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu="),
+    C_OPEN_TYPE9("C_OPEN_TYPE9","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu="),
     C_OPEN_TYPE10("C_OPEN_TYPE10","",""),
     C_OPEN_TYPE11("C_OPEN_TYPE11","component","MessagePage/ProjectDetailModal"),
     C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal");
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java
index c942e685..9c283f71 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDistributionRecord.java
@@ -89,4 +89,10 @@ public class PayWorkingGroupDistributionRecord implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "联系人ids 多个以逗号分隔")
     private java.lang.String contactsIds;
+    /**
+     * 联系人临时id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "联系人临时id")
+    private String temporaryContactsId;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
index 09c5774c..c1748c47 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
@@ -2,6 +2,7 @@ package com.jero.project.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -162,14 +163,19 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String finalMsg = msg;
         list.forEach(p->{
+            List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->Objects.equals(item.getTemporaryContactsId(),p.getId())).collect(Collectors.toList());
+            if(CollectionUtils.isEmpty(listStr)){
+                return;
+            }
+
             // 发送消息
             SendMessageDTO sendMessageDTO = new SendMessageDTO();
             if(!StringUtils.isBlank(p.getEmail())){
                 sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
             }
             if(!StringUtils.isEmpty(p.getPhone())){
-                sendMessageDTO.setToUser(PasswordUtil.encrypt(p.getPhone()));
-                sendMessageDTO.setPhone(PasswordUtil.encrypt(p.getPhone()));
+                sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
+                sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
             }
             HashMap<String,String> map = new HashMap<>();
             map.put("workGroupName", finalMsg);
@@ -178,6 +184,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
             sendMessageDTO.setTemplateParam(map);
             sendMessageDTO.setListFile(listFile);
             sendMessageDTO.setBusType("C_OPEN_TYPE12");
+            JSONObject json = new JSONObject();
+            if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
+                json.put("id",listStr.get(0).getSubId());
+            }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
+                json.put("id",listStr.get(0).getProjectId());
+            }
+            sendMessageDTO.setBusId(json.toJSONString());
             sendMessageService.SendMessageService(sendMessageDTO);
         });
     }
@@ -285,14 +298,18 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String finalMsg = msg;
         list.forEach(p->{
+            List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->Objects.equals(item.getTemporaryContactsId(),p.getId())).collect(Collectors.toList());
+            if(CollectionUtils.isEmpty(listStr)){
+                return;
+            }
             // 发送消息
             SendMessageDTO sendMessageDTO = new SendMessageDTO();
             if(!StringUtils.isBlank(p.getEmail())){
                 sendMessageDTO.setEmail(PasswordUtil.decrypt(p.getEmail()));
             }
             if(!StringUtils.isEmpty(p.getPhone())){
-                sendMessageDTO.setToUser(PasswordUtil.encrypt(p.getPhone()));
-                sendMessageDTO.setPhone(PasswordUtil.encrypt(p.getPhone()));
+                sendMessageDTO.setToUser(PasswordUtil.decrypt(p.getPhone()));
+                sendMessageDTO.setPhone(PasswordUtil.decrypt(p.getPhone()));
             }
             HashMap<String,String> map = new HashMap<>();
             map.put("workGroupName", finalMsg);
@@ -301,6 +318,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
             sendMessageDTO.setTemplateParam(map);
             sendMessageDTO.setListFile(listFile);
             sendMessageDTO.setBusType("C_OPEN_TYPE12");
+            JSONObject json = new JSONObject();
+            if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){
+                json.put("id",listStr.get(0).getSubId());
+            }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
+                json.put("id",listStr.get(0).getProjectId());
+            }
+            sendMessageDTO.setBusId(json.toJSONString());
             sendMessageService.SendMessageService(sendMessageDTO);
         });
     }
@@ -329,6 +353,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                     payWorkingGroupDistributionRecordNew.setSubId(p.getId());
                     payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdOne());
                     payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameOne());
+                    payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdOne());
                     listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
                 }
                 if(!StringUtils.isEmpty(p.getContactsTemporaryIdTwo()) && Arrays.asList(s).contains(p.getContactsTemporaryIdTwo())){
@@ -340,6 +365,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                     payWorkingGroupDistributionRecordNew.setSubId(p.getId());
                     payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdTwo());
                     payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameTwo());
+                    payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdTwo());
                     listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
                 }
                 if(!StringUtils.isEmpty(p.getContactsTemporaryIdThree()) && Arrays.asList(s).contains(p.getContactsTemporaryIdThree())){
@@ -351,6 +377,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                     payWorkingGroupDistributionRecordNew.setSubId(p.getId());
                     payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsIdThree());
                     payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryNameThree());
+                    payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryIdThree());
                     listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
                 }
             });