|
@@ -368,12 +368,12 @@ public class OrderReportServiceImpl extends ServiceImpl<OrderReportMapper, Order
|
|
|
fileUrl = fileApi.createFile(pdf);
|
|
fileUrl = fileApi.createFile(pdf);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// if (Objects.equals(env, "uat")) {
|
|
|
|
|
-// reportUrl = minioHostouter + fileUrl;
|
|
|
|
|
-// } else {
|
|
|
|
|
-// reportUrl = minioHost + fileUrl;
|
|
|
|
|
-// }
|
|
|
|
|
- log.info("报告url:{}", fileUrl);
|
|
|
|
|
|
|
+ if (Objects.equals(env, "uat")) {
|
|
|
|
|
+ reportUrl = minioHostouter + fileUrl;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ reportUrl = minioHost + fileUrl;
|
|
|
|
|
+ }
|
|
|
|
|
+ log.info("报告url:{}", reportUrl);
|
|
|
// 发送邮件
|
|
// 发送邮件
|
|
|
MailSendSingleToUserReqDTO sendParam = new MailSendSingleToUserReqDTO();
|
|
MailSendSingleToUserReqDTO sendParam = new MailSendSingleToUserReqDTO();
|
|
|
sendParam.setMail(pageReqVO.getEmail());
|
|
sendParam.setMail(pageReqVO.getEmail());
|
|
@@ -381,7 +381,7 @@ public class OrderReportServiceImpl extends ServiceImpl<OrderReportMapper, Order
|
|
|
sendParam.setUserId(userId);
|
|
sendParam.setUserId(userId);
|
|
|
sendParam.setTemplateParams(templateParams);
|
|
sendParam.setTemplateParams(templateParams);
|
|
|
|
|
|
|
|
- sendParam.setFilePath(List.of(fileUrl));
|
|
|
|
|
|
|
+ sendParam.setFilePath(List.of(reportUrl));
|
|
|
sendParam.setAttachmentNames(List.of(attachmentName));
|
|
sendParam.setAttachmentNames(List.of(attachmentName));
|
|
|
|
|
|
|
|
mailSendApi.sendSingleMailToMember(sendParam);
|
|
mailSendApi.sendSingleMailToMember(sendParam);
|