From ad3f353e495b7cafe565dfc3a9305d7162ce42ba Mon Sep 17 00:00:00 2001 From: yangkai Date: Tue, 4 Sep 2018 19:52:18 +0800 Subject: [PATCH] =?UTF-8?q?update:=E6=B1=87=E4=BB=98=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 3 ++- src/main/resources/templates/mail/hf_email_notice.html | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 9930d0d8f..da95e6eea 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -3779,7 +3779,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid ctx.setVariable("name", client.getString("contact_person")); ctx.setVariable("order_id", order.getString("order_id")); ctx.setVariable("amount", order.getString("total_amount")); - ctx.setVariable("time", order.getString("create_time")); + String create_time = DateFormatUtils.format(order.getDate("create_time"), "yyyy-MM-dd HH:mm:ss"); + ctx.setVariable("time", create_time); final String content = thymeleaf.process( "mail/hf_email_notice", ctx); final String mailTo = client.getString("contact_email"); if (StringUtils.isEmpty(mailTo)) { diff --git a/src/main/resources/templates/mail/hf_email_notice.html b/src/main/resources/templates/mail/hf_email_notice.html index f0059fbf0..d7f5e6275 100644 --- a/src/main/resources/templates/mail/hf_email_notice.html +++ b/src/main/resources/templates/mail/hf_email_notice.html @@ -15,6 +15,7 @@

RoyalPay到账提醒：