From 8dbdca7ebbb0d29c9e9a453d7e57336d174688b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 5 May 2022 15:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=82=AC=E6=AC=BE?=
 =?UTF-8?q?=E6=8F=90=E9=86=92=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=A4=B1=E8=B4=A5=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemController.java     | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 5a76c588..80a00b8c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -368,32 +368,40 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		 if(CollectionUtils.isEmpty(listPayContactsManagementTemporary)){
 			 return Result.error("联系人不存在!");
 		 }
+		 List<String> listMsg = new ArrayList<>();
 		 listPayWorkingGroupSubItem.forEach(p->{
 			 List<PayContactsManagementTemporary> listContactsInfo = listPayContactsManagementTemporary.stream().filter(item->Objects.equals(p.getContactsTemporaryIdOne(),item.getId())).collect(Collectors.toList());
 			 if(CollectionUtils.isEmpty(listContactsInfo)){
 			 	return;
 			 }
-			 // 发送消息
-			 SendMessageDTO sendMessageDTO = new SendMessageDTO();
-			 if(!StringUtils.isBlank(listContactsInfo.get(0).getEmail())){
-				 sendMessageDTO.setEmail(PasswordUtil.decrypt(listContactsInfo.get(0).getEmail()));
+			 try {
+
+				 // 发送消息
+				 SendMessageDTO sendMessageDTO = new SendMessageDTO();
+				 if (!StringUtils.isBlank(listContactsInfo.get(0).getEmail())) {
+					 sendMessageDTO.setEmail(PasswordUtil.decrypt(listContactsInfo.get(0).getEmail()));
+				 }
+				 if (!StringUtils.isBlank(listContactsInfo.get(0).getPhone())) {
+					 sendMessageDTO.setToUser(PasswordUtil.decrypt(listContactsInfo.get(0).getPhone()));
+					 sendMessageDTO.setPhone(PasswordUtil.decrypt(listContactsInfo.get(0).getPhone()));
+				 }
+				 HashMap<String, String> map = new HashMap<>();
+				 map.put("projectName", payWorkingGroup.getWorkingGroupProject());
+				 sendMessageDTO.setFromUser(sysUser.getUsername());
+				 sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode());
+				 sendMessageDTO.setTemplateParam(map);
+				 sendMessageDTO.setBusType("C_OPEN_TYPE11");
+				 JSONObject json = new JSONObject();
+				 json.put("id", p.getId());
+				 sendMessageDTO.setBusId(json.toJSONString());
+				 sendMessageService.SendMessageService(sendMessageDTO);
+			 }catch (Exception e){
+				 if(e.getMessage().contains("邮件发送") && !listMsg.contains(p.getChargeCompanyTemporaryName() + "单位邮箱发送失败")){
+					 listMsg.add(p.getChargeCompanyTemporaryName() + "单位邮箱发送失败");
+				 }
 			 }
-			 if(!StringUtils.isBlank(listContactsInfo.get(0).getPhone())){
-				 sendMessageDTO.setToUser(PasswordUtil.decrypt(listContactsInfo.get(0).getPhone()));
-				 sendMessageDTO.setPhone(PasswordUtil.decrypt(listContactsInfo.get(0).getPhone()));
-			 }
-			 HashMap<String,String> map = new HashMap<>();
-			 map.put("projectName",payWorkingGroup.getWorkingGroupProject());
-			 sendMessageDTO.setFromUser(sysUser.getUsername());
-			 sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG11.getCode());
-			 sendMessageDTO.setTemplateParam(map);
-			 sendMessageDTO.setBusType("C_OPEN_TYPE11");
-			 JSONObject json = new JSONObject();
-			 json.put("id",p.getId());
-			 sendMessageDTO.setBusId(json.toJSONString());
-			 sendMessageService.SendMessageService(sendMessageDTO);
 		 });
-		 return Result.OK("添加成功！");
+		 return Result.OK("催款提醒成功！",listMsg);
 	 }
 
 	 /**