From 02e482c8718840bec33720d596c24db6ae6ebbdb Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 27 Dec 2017 10:47:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/clearing/core/impl/CleanServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) 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 104ea449a..a0d254e47 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 @@ -842,10 +842,6 @@ public class CleanServiceImpl implements CleanService, ApplicationEventPublisher // 测试用地址 // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content, // attachList); - // String mailId = mailService.sendEmail(title, "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", - // content, attachList); - // todo 等fazal休假结算后恢复 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,tommy.yang@royalpay.com.au", content, attachList); From cdadaaa4273cabd5121465b10dc2f85337f969f0 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 27 Dec 2017 10:58:43 +0800 Subject: [PATCH 2/4] fixbug --- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 52c5b03a0..2d8488498 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 @@ -627,8 +627,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid // todo Velocity Context ctx = new Context(); ctx.setVariable("bds", bds); - ctx.setVariable("credential_code", username); ctx.setVariable("password", pwd); + ctx.setVariable("username", username); ctx.setVariable("client_moniker", client.getString("client_moniker")); ctx.setVariable("contact_person", client.getString("contact_person")); ctx.setVariable("credential_code", client.getString("credential_code")); From 8b078e28a772edccef4792d570ce939067e747a8 Mon Sep 17 00:00:00 2001 From: Tayl0r <519104047@qq.com> Date: Wed, 27 Dec 2017 11:55:52 +0800 Subject: [PATCH 3/4] fix bugs --- .../payment/manage/tradelog/refund/impls/RefundServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java index b7c2e2fe1..6a77fe285 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java @@ -183,7 +183,7 @@ public class RefundServiceImpl implements RefundService, ApplicationEventPublish BigDecimal realAmount = original ? fee : CurrencyAmountUtils.toAmount(fee, order.getString("currency")); JSONObject refundConfig = checkRefundAuditFlag(); - if (refundConfig != null && refundConfig.size() > 0 && refundConfig.getBoolean("refundAudit")) { + if (partnerAccount!=null && refundConfig != null && refundConfig.size() > 0 && refundConfig.getBoolean("refundAudit")) { if (realAmount.compareTo(refundConfig.getBigDecimal("refundAuditAmount")) > 0) { //订单需要审核 boolean casherRefund = reviewNewRefundOrder(orderId, realAmount, remark, partnerAccount, manager); From 9647e0e1f4d64c64c1e09cc95462ff9189f6a180 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Wed, 27 Dec 2017 12:15:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one_dollar_day/merchant_detail.html | 10 ++-- .../templates/mail/register_application.html | 53 ------------------- .../templates/mail/reset_password.html | 3 +- .../templates/reports/week_report.html | 44 +-------------- 4 files changed, 8 insertions(+), 102 deletions(-) delete mode 100644 src/main/resources/templates/mail/register_application.html diff --git a/src/main/resources/templates/activity/one_dollar_day/merchant_detail.html b/src/main/resources/templates/activity/one_dollar_day/merchant_detail.html index 8bd064772..ce1e7710f 100644 --- a/src/main/resources/templates/activity/one_dollar_day/merchant_detail.html +++ b/src/main/resources/templates/activity/one_dollar_day/merchant_detail.html @@ -30,21 +30,21 @@

- 买单 + 买单

-
+
-
+
- +
-
+
diff --git a/src/main/resources/templates/mail/register_application.html b/src/main/resources/templates/mail/register_application.html deleted file mode 100644 index f0f14b3a5..000000000 --- a/src/main/resources/templates/mail/register_application.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
-

Register Invitation

-
-

Dear Partner,

-

Thank you for registering an account with us!

-

This is a system verification email from RoyalPay. RoyalPay is an exciting platform that makes international payments as easy as local ones. - To get started, click on the button below:

-
- - - - -
- Register your account right now! -
- -
-
\ No newline at end of file diff --git a/src/main/resources/templates/mail/reset_password.html b/src/main/resources/templates/mail/reset_password.html index 4a0aa5e7d..cbc7bc56d 100644 --- a/src/main/resources/templates/mail/reset_password.html +++ b/src/main/resources/templates/mail/reset_password.html @@ -34,11 +34,10 @@ - #foreach($item in $accounts)
- , Reset Password + , Reset Password
diff --git a/src/main/resources/templates/reports/week_report.html b/src/main/resources/templates/reports/week_report.html index 41c182525..e3bcd0070 100644 --- a/src/main/resources/templates/reports/week_report.html +++ b/src/main/resources/templates/reports/week_report.html @@ -123,7 +123,7 @@ th:if="${report.transaction_report.melbourne.thisweek.compare.direction<0}" th:text="'↓'+${report.transaction_report.melbourne.thisweek.compare.value}"> $report.transaction_report.melbourne.thisweek.compare.value + th:text="${report.transaction_report.melbourne.thisweek.compare.value}">
@@ -172,7 +172,7 @@ th:if="${report.transaction_report.sydney.thisweek.compare.direction<0}" th:text="'↓'+${$report.transaction_report.sydney.thisweek.compare.value}"> $report.transaction_report.sydney.thisweek.compare.value + th:text="${$report.transaction_report.sydney.thisweek.compare.value}"> @@ -226,89 +226,49 @@ - ##
- ##
新增商户情况(Melbourne)
- ##
- ##
- ##
- ##
- ##
- ##
- ##
- ##
- ##
- ##
- ##
- ##
- ##
新增总数
- ##
- ##
- ##
- ##
- ## - ##
- ##
新增商户情况(Sydney)
- ##
- ##
- ##
- ##
- ##
- ##
- ##
- ## #end - ##
- ##
- ##
- ##
- ##
- ##
新增总数
- ##
- ##
- ##
- ##