diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 28229651f..c99cf7636 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -29,6 +29,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage; import au.com.royalpay.payment.tools.defines.TradeType; import au.com.royalpay.payment.tools.env.PlatformEnvironment; +import au.com.royalpay.payment.tools.env.SysConfigManager; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.ForbiddenException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; @@ -153,6 +154,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider private SpringTemplateEngine thymeleaf; @Resource private ClientConfigService clientConfigService; + @Resource + private SysConfigManager sysConfigManager; @Value("${app.settlement.email-to}") private String settlementEmailTo; @@ -969,11 +972,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider String title = "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd"); JSONObject model = new JSONObject(); model.put("date", DateFormatUtils.format(date, "dd-MM-yyyy")); - // todo themeleaf - - - // final String content = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, - // "mail/settlement_mail.vm", "utf-8", model); String fileName1 = "Merchant_Settlement_Info_xlsx_" + DateFormatUtils.format(date, "yyyyMMdd"); List attachList = new ArrayList<>(); JSONObject attach1 = new JSONObject(); @@ -1017,9 +1015,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider // 测试用地址 // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content, // attachList); - String mailId = mailService.sendEmail(title, "diana.baldi@flexewallet.com,steven.stamboultgis@novatti.com,fazal.cader@flexewallet.com", - "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com,ben.evans@royalpay.com.au", - content, attachList); + JSONObject config = sysConfigManager.getSysConfig(); + String mailId = mailService.sendEmail(title, config.getString("settle_mail_to"),config.getString("settle_mail_cc"), content, attachList); if (settleMail == null) { JSONObject settleMailRecord = new JSONObject();