From bf633a3d40d3bfc9cdf20e029e3e3c6c9cfa6847 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sun, 26 Sep 2021 17:10:53 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E4=BA=BA=E6=97=B6=E6=8F=90=E9=86=92=EF=BC=8C=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index bcd7c1d5..2c2e93de 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.common.ProjectCommon;
@@ -127,6 +128,34 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId());
             contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation.getCompanyName(), payMeetingSituation.getId());
         }
+        String meetingId = payMeetingSituation1.getMeetingId();
+        PayMeeting payMeeting = meetingService.getById(meetingId);
+        SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
+    }
+
+    private void SendPaymentRecordMessage(PayMeetingSituation payMeetingSituation, PayMeeting payMeeting) {
+        String paymentRecord = payMeetingSituation.getPaymentRecord();
+        //上传付款凭证发送邮件提醒审批
+        if (StringUtils.isNotBlank(paymentRecord)) {
+            String directorId = payMeeting.getDirectorId();
+            LoginUser director = iSysBaseApi.getUserById(directorId);
+            // 给负责人发送消息
+            SendMessageDTO sendMessageDTO = new SendMessageDTO();
+            if (!StringUtils.isBlank(director.getEmail())) {
+                sendMessageDTO.setEmail(PasswordUtil.decrypt(director.getEmail()));
+            }
+            if (!StringUtils.isBlank(director.getPhone())) {
+                sendMessageDTO.setToUser(director.getUsername());
+                //sendMessageDTO.setPhone(PasswordUtil.decrypt(director.getPhone()));
+            }
+            HashMap<String, String> map = new HashMap<>();
+            sendMessageDTO.setFromUser(director.getUsername());
+            sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG5.getCode());
+            sendMessageDTO.setTemplateParam(map);
+            sendMessageDTO.setBusType("M_OPEN_TYPE5");
+            sendMessageDTO.setBusId(payMeetingSituation.getId());
+            sendMessageService.SendMessageService(sendMessageDTO);
+        }
     }
 
     /**
@@ -220,29 +249,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
             }
         }
-        String paymentRecord = payMeetingSituation1.getPaymentRecord();
-        Integer checkResult = payMeetingSituation1.getCheckResult();
-        //上传付款凭证并且审批结果不为通过发送邮件提醒审批
-        if (StringUtils.isNotBlank(paymentRecord) && !Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) {
-            String directorId = payMeeting.getDirectorId();
-            LoginUser director = iSysBaseApi.getUserById(directorId);
-            // 给负责人发送消息
-            SendMessageDTO sendMessageDTO = new SendMessageDTO();
-            if (!StringUtils.isBlank(director.getEmail())) {
-                sendMessageDTO.setEmail(PasswordUtil.decrypt(director.getEmail()));
-            }
-            if (!StringUtils.isBlank(director.getPhone())) {
-                sendMessageDTO.setToUser(director.getUsername());
-                //sendMessageDTO.setPhone(PasswordUtil.decrypt(director.getPhone()));
-            }
-            HashMap<String, String> map = new HashMap<>();
-            sendMessageDTO.setFromUser(director.getUsername());
-            sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG5.getCode());
-            sendMessageDTO.setTemplateParam(map);
-            sendMessageDTO.setBusType("M_OPEN_TYPE5");
-            sendMessageDTO.setBusId(payMeetingSituation1.getId());
-            sendMessageService.SendMessageService(sendMessageDTO);
-        }
+        SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
     }
 
     /**
@@ -302,7 +309,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         sendMessageDTO.setTemplateCode(companyMessageEnums.getCode());
         sendMessageDTO.setTemplateParam(map);
         sendMessageDTO.setBusType(busType);
-        sendMessageDTO.setBusId(payMeetingSituation.getId());
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("id",payMeetingSituation.getId());
+        sendMessageDTO.setBusId(jsonObject.toJSONString());
         sendMessageService.SendMessageService(sendMessageDTO);
     }