邮件发送

base-buildpackage/src/main/java/com/hzya/frame/plugin/sendEmail/service/impl/SendEmailServiceImpl.java

@@ -81,7 +81,7 @@ public class SendEmailServiceImpl extends BaseService<SendEmailEntity, String> 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<SendEmailEntity, String> i
         }
         if(ids != null && ids.size() > 0){
             SendEmailEntity fileEntity = new SendEmailEntity();
-            fileEntity.setDataSourceCode("HT-OA");
+            fileEntity.setDataSourceCode("zjoa");
-            fileEntity.setId(mainData.getString("field0040"));
+            fileEntity.setIds(ids);
             files = sendEmailDao.queryFileList(fileEntity);
         }
         List<MultipartFile> attachments = new ArrayList<>();
@@ -125,8 +125,8 @@ public class SendEmailServiceImpl extends BaseService<SendEmailEntity, String> i
                         body();
                 logger.error("OAToken：" + tokenResult);
                 JSONObject resoutJson = JSONObject.parseObject(tokenResult);
-                if (resoutJson.getBoolean("flag")) {
+                if (resoutJson.getString("id") != null && !"".equals(resoutJson.getString("id")) ) {
-                    token = resoutJson.getJSONObject("attribute").getString("id");
+                    token = resoutJson.getString("id") ;
                 } else {
                     return BaseResult.getFailureMessageEntity("获取OA token失败");
                 }
@@ -155,10 +155,10 @@ public class SendEmailServiceImpl extends BaseService<SendEmailEntity, String> 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<SendEmailEntity, String> i
 
         // 拼接标题区域
         sb.append("    <div style=\"text-align: center; margin-bottom: 30px; padding-bottom: 15px; border-bottom: 2px solid #34495e;\">");
-        sb.append("        <h2 style=\"font-size: 26px; color: #2c3e50; letter-spacing: 2px; margin: 0; font-family: 'Microsoft YaHei', 'SimSun', sans-serif;\">"+mainData.getOrDefault("field0016","")+"采购单</h2>");
+        sb.append("        <h2 style=\"font-size: 26px; color: #2c3e50; letter-spacing: 2px; margin: 0; font-family: 'Microsoft YaHei', 'SimSun', sans-serif;\">"+mainData.getOrDefault("field0022","")+"采购订单</h2>");
         sb.append("    </div>");
         sb.append("");
         String field0004str = "";
@@ -253,7 +253,7 @@ public class SendEmailServiceImpl extends BaseService<SendEmailEntity, String> i
         sb.append("            <span style=\"color: #2c3e50; padding-left: 8px; border-bottom: 1px dashed #d1d1d1; flex: 1;\">"+field0004str+"</span>");
         sb.append("        </div>");
         sb.append("        <div style=\"flex: 1; display: flex;\">");
-        sb.append("            <span style=\"font-weight: 600; color: #34495e; min-width: 110px;\">单据编号：</span>");
+        sb.append("            <span style=\"font-weight: 600; color: #34495e; min-width: 110px;\">采购订单号：</span>");
         sb.append("            <span style=\"color: #2c3e50; padding-left: 8px; border-bottom: 1px dashed #d1d1d1; flex: 1;\">"+mainData.getOrDefault("field0001","")+"</span>");
         sb.append("        </div>");
         sb.append("    </div>");
@@ -381,9 +381,15 @@ public class SendEmailServiceImpl extends BaseService<SendEmailEntity, String> i
 
         sb.append("        </tbody>");
         sb.append("    </table>");
-
+        sb.append("<div>");
+        sb.append("订单说明： <br> ");
+        sb.append("1、对以上订单内容请在2个工作日内予以确认回复，并签注明确的交货日期，请务必盖章、签字回传；否则视同接受该订单。 <br> ");
+        sb.append("2、不同料号物资分开包装。并在外包装标贴我公司的物料编码。 <br> ");
+        sb.append("3、乙方在送货或发货时，送货单与货同行，并在送货单上填写订单物料编码、材料名称、规格型号、数量、箱数等。 <br> ");
+        sb.append("4、对有RoHS、防静电等要求物资：要确保产品符合相关要求，并提供有效认证报告。 <br> ");
         // 闭合主容器div
         sb.append("</div>");
+        sb.append("</div>");
 
 
         return sb.toString();

base-buildpackage/src/main/resources/application-zhouju.yml

@@ -9,10 +9,16 @@ logging:
     path: D:\yongansystem\log\zs
 spring:
   mail:
-    host: smtp.qq.com
+    first:
-    port: 587
+      host: smtp.sptchina.cn
-    username: 957075182@qq.com
+      port: 25
-    password: lcmgbgaxuhsbbbei
+      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: