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 listMsg = new ArrayList<>(); listPayWorkingGroupSubItem.forEach(p->{ List 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 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 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); } /**