github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

email is now sent to user and service

pull/6221/head
Gauthier LO 2023-08-21 15:16:54 +02:00
parent cd4ad1e5fe
commit 1fb0f154ca
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/admin/shippingInvoice/InvoiceController.java
View File

@ -475,6 +475,8 @@ public class InvoiceController {
} }
if(!invoiceList.isEmpty()) { if(!invoiceList.isEmpty()) {
List<String> filenameList = new ArrayList<>(); List<String> filenameList = new ArrayList<>();
log.info("Generating detail files ...0/{}", invoiceList.size());
int cpt = 1;
for(InvoiceMetaData metaData: invoiceList){ for(InvoiceMetaData metaData: invoiceList){
if(metaData.getInvoiceCode().equals("error")) { if(metaData.getInvoiceCode().equals("error")) {
metaDataErrorList.add(metaData); metaDataErrorList.add(metaData);
@ -486,10 +488,12 @@ public class InvoiceController {
shippingInvoiceService.exportToExcel(factureDetails, refunds, metaData.getInvoiceCode(), metaData.getInvoiceEntity()); shippingInvoiceService.exportToExcel(factureDetails, refunds, metaData.getInvoiceCode(), metaData.getInvoiceEntity());
filenameList.add(INVOICE_DETAIL_DIR + "//Détail_calcul_de_facture_" + metaData.getInvoiceCode() + "_(" + metaData.getInvoiceEntity() + ").xlsx"); filenameList.add(INVOICE_DETAIL_DIR + "//Détail_calcul_de_facture_" + metaData.getInvoiceCode() + "_(" + metaData.getInvoiceEntity() + ").xlsx");
} }
log.info("Generating detail files ...{}/{}", cpt++, invoiceList.size());
} }
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String zipFilename = shippingInvoiceService.zipInvoices(filenameList); String zipFilename = shippingInvoiceService.zipInvoices(filenameList);
String subject = "Invoices generated from Breakdown Page"; String subject = "Invoices generated from Breakdown Page";
String destEmail = env.getProperty("spring.mail.username"); String destEmail = sysUser.getEmail();
Properties prop = emailService.getMailSender(); Properties prop = emailService.getMailSender();
Map <String, Object> templateModel = new HashMap<>(); Map <String, Object> templateModel = new HashMap<>();
templateModel.put("errors", metaDataErrorList); templateModel.put("errors", metaDataErrorList);
@ -507,6 +511,8 @@ public class InvoiceController {
String htmlBody = FreeMarkerTemplateUtils.processTemplateIntoString(freemarkerTemplate, templateModel); String htmlBody = FreeMarkerTemplateUtils.processTemplateIntoString(freemarkerTemplate, templateModel);
emailService.sendMessageWithAttachment(destEmail, subject, htmlBody, zipFilename,session); emailService.sendMessageWithAttachment(destEmail, subject, htmlBody, zipFilename,session);
log.info("Mail sent successfully"); log.info("Mail sent successfully");
pendingTaskService.setStatus(0, "BI");
return Result.OK("component.email.emailSent"); return Result.OK("component.email.emailSent");
} }
catch(Exception e) { catch(Exception e) {
@ -514,6 +520,7 @@ public class InvoiceController {
return Result.error("An error occurred while trying to send an email."); return Result.error("An error occurred while trying to send an email.");
} }
} }
pendingTaskService.setStatus(0, "BI"); pendingTaskService.setStatus(0, "BI");
return Result.ok(); return Result.ok();
} }

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/EmailServiceImpl.java
View File

@ -45,7 +45,9 @@ public class EmailServiceImpl implements EmailService {
Message message = new MimeMessage(session); Message message = new MimeMessage(session);
message.setFrom(new InternetAddress(Objects.requireNonNull(env.getProperty("spring.mail.username")))); message.setFrom(new InternetAddress(Objects.requireNonNull(env.getProperty("spring.mail.username"))));
message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(recipient)); message.setRecipient(Message.RecipientType.TO, InternetAddress.parse(recipient)[0]);
if(!recipient.equals(env.getProperty("spring.mail.username")))
message.setRecipient(Message.RecipientType.CC, InternetAddress.parse(Objects.requireNonNull(env.getProperty("spring.mail.username")))[0]);
message.setSubject(subject); message.setSubject(subject);