Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -3779,7 +3779,14 @@ 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"));
-        String create_time = DateFormatUtils.format(order.getDate("create_time"), "yyyy-MM-dd HH:mm:ss");
+        ctx.setVariable("currency", order.getString("currency"));
+        String create_time = "";
+        if (client.getString("timezone") != null) {
+            create_time = DateFormatUtils.format(order.getDate("create_time"),
+                    "yyyy-MM-dd HH:mm:ss", TimeZone.getTimeZone(client.getString("timezone")));
+        } else {
+            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");

src/main/resources/templates/mail/hf_email_notice.html

@@ -17,7 +17,7 @@
             <ul>
                 <li style="margin-bottom: 6px;">支付渠道：<span style="color: #EE6723;">汇付</span></li>
                 <li style="margin-bottom: 6px;">订单编号：<span style="color: #EE6723;" th:text="${order_id}"></span></li>
-                <li style="margin-bottom: 6px;">收款金额：<span style="color: #EE6723;" th:text="${amount}"></span></li>
+                <li style="margin-bottom: 6px;">收款金额：<span style="color: #EE6723;" th:text="${currency}"></span>&nbsp;<span style="color: #EE6723;" th:text="${amount}"></span></li>
                 <li style="margin-bottom: 6px;">到账时间：<span style="color: #EE6723;" th:text="${time}"></span></li>
             </ul>
         </div>