From 31c1d471ef5ddea5586a5c981c87c6679b02f26d Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 5 Aug 2025 09:38:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SendEmailServiceImpl.java | 26 ++++++++++++------- .../src/main/resources/application-zhouju.yml | 14 +++++++--- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/sendEmail/service/impl/SendEmailServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sendEmail/service/impl/SendEmailServiceImpl.java index 6ace28f9..c33f169f 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/sendEmail/service/impl/SendEmailServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sendEmail/service/impl/SendEmailServiceImpl.java @@ -81,7 +81,7 @@ public class SendEmailServiceImpl extends BaseService i return BaseResult.getFailureMessageEntity("供应商邮箱为空，请检查"); } String subject = null; - subject = mainData.getOrDefault("field0016","")+"采购";//供应商名称+采购 + subject = mainData.getOrDefault("field0022","")+"采购订单";//供应商名称+采购 JSONArray detailArray = businessDataStr.getJSONArray("formson_1234"); //组装发送数据 @@ -103,8 +103,8 @@ public class SendEmailServiceImpl extends BaseService i } if(ids != null && ids.size() > 0){ SendEmailEntity fileEntity = new SendEmailEntity(); - fileEntity.setDataSourceCode("HT-OA"); - fileEntity.setId(mainData.getString("field0040")); + fileEntity.setDataSourceCode("zjoa"); + fileEntity.setIds(ids); files = sendEmailDao.queryFileList(fileEntity); } List attachments = new ArrayList<>(); @@ -125,8 +125,8 @@ public class SendEmailServiceImpl extends BaseService i body(); logger.error("OAToken：" + tokenResult); JSONObject resoutJson = JSONObject.parseObject(tokenResult); - if (resoutJson.getBoolean("flag")) { - token = resoutJson.getJSONObject("attribute").getString("id"); + if (resoutJson.getString("id") != null && !"".equals(resoutJson.getString("id")) ) { + token = resoutJson.getString("id") ; } else { return BaseResult.getFailureMessageEntity("获取OA token失败"); } @@ -155,10 +155,10 @@ public class SendEmailServiceImpl extends BaseService i if(attachments != null && attachments.size() > 0){ emailUtil.sendHtmlAndFileMessage("1",sendEmail,subject, htmls,attachments); - emailUtil.sendHtmlAndFileMessage("2",sendEmail,subject, htmls,attachments); + //emailUtil.sendHtmlAndFileMessage("2",sendEmail,subject, htmls,attachments); }else { emailUtil.sendHtmlMessage("1",sendEmail,subject, htmls); - emailUtil.sendHtmlMessage("2",sendEmail,subject, htmls); + //emailUtil.sendHtmlMessage("2",sendEmail,subject, htmls); } return BaseResult.getSuccessMessageEntity("发送邮件成功"); }catch (Exception e){ @@ -238,7 +238,7 @@ public class SendEmailServiceImpl extends BaseService i // 拼接标题区域 sb.append("
"); - sb.append("

"+mainData.getOrDefault("field0016","")+"采购单

"); + sb.append("

"+mainData.getOrDefault("field0022","")+"采购订单

"); sb.append("
"); sb.append(""); String field0004str = ""; @@ -253,7 +253,7 @@ public class SendEmailServiceImpl extends BaseService i sb.append(" "+field0004str+""); sb.append(" "); sb.append("
"); - sb.append(" 单据编号："); + sb.append(" 采购订单号："); sb.append(" "+mainData.getOrDefault("field0001","")+""); sb.append("
"); sb.append(" "); @@ -381,9 +381,15 @@ public class SendEmailServiceImpl extends BaseService i sb.append(" "); sb.append(" "); - + sb.append("
"); + sb.append("订单说明：
"); + sb.append("1、对以上订单内容请在2个工作日内予以确认回复，并签注明确的交货日期，请务必盖章、签字回传；否则视同接受该订单。
"); + sb.append("2、不同料号物资分开包装。并在外包装标贴我公司的物料编码。
"); + sb.append("3、乙方在送货或发货时，送货单与货同行，并在送货单上填写订单物料编码、材料名称、规格型号、数量、箱数等。
"); + sb.append("4、对有RoHS、防静电等要求物资：要确保产品符合相关要求，并提供有效认证报告。
"); // 闭合主容器div sb.append("
"); + sb.append(""); return sb.toString(); diff --git a/base-buildpackage/src/main/resources/application-zhouju.yml b/base-buildpackage/src/main/resources/application-zhouju.yml index db3f2b0f..ffd8dbcd 100644 --- a/base-buildpackage/src/main/resources/application-zhouju.yml +++ b/base-buildpackage/src/main/resources/application-zhouju.yml @@ -9,10 +9,16 @@ logging: path: D:\yongansystem\log\zs spring: mail: - host: smtp.qq.com - port: 587 - username: 957075182@qq.com - password: lcmgbgaxuhsbbbei + first: + host: smtp.sptchina.cn + port: 25 + username: mro@sptchina.cn + password: VeaQDO9zjuYpGc1i + second: + host: smtp.qq.com + port: 587 + username: 957075182@qq.com + password: lcmgbgaxuhsbbbei default-encoding: UTF-8 properties: mail: