From ed810dcefa25b8ce1ddb561b7d06389553a7805d Mon Sep 17 00:00:00 2001 From: yixian Date: Fri, 2 Mar 2018 14:10:37 +0800 Subject: [PATCH 1/3] hide gst in customer's view --- .../static/payment/partner/templates/partner_bankaccounts.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html index fe75673dc..3f7857156 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -14,7 +14,7 @@
- +
From 89a9c1c0616a96a8602144e4bf6bd80dfe86dd68 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Mon, 5 Mar 2018 16:35:33 +0800 Subject: [PATCH 2/3] fix change logo --- .../templates/activity/one_dollar_day/merchant_bind.html | 2 +- src/main/resources/templates/mail/reset_password.html | 2 +- src/main/resources/templates/paynotice.html | 2 +- src/main/resources/templates/refund_status.html | 2 +- src/main/ui/static/analysis/partner_card.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html b/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html index 7be329176..92e37d9cd 100644 --- a/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html +++ b/src/main/resources/templates/activity/one_dollar_day/merchant_bind.html @@ -16,7 +16,7 @@ - +

身份绑定已完成，奖励将随后发出，敬请留意微信通知

\ 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 cbc7bc56d..88f5b04f3 100644 --- a/src/main/resources/templates/mail/reset_password.html +++ b/src/main/resources/templates/mail/reset_password.html @@ -10,7 +10,7 @@ diff --git a/src/main/resources/templates/paynotice.html b/src/main/resources/templates/paynotice.html index 64d26ce80..0939a2e3f 100644 --- a/src/main/resources/templates/paynotice.html +++ b/src/main/resources/templates/paynotice.html @@ -56,7 +56,7 @@
- +
diff --git a/src/main/resources/templates/refund_status.html b/src/main/resources/templates/refund_status.html index 55084797e..7a56e0d0e 100644 --- a/src/main/resources/templates/refund_status.html +++ b/src/main/resources/templates/refund_status.html @@ -52,7 +52,7 @@
- +
diff --git a/src/main/ui/static/analysis/partner_card.js b/src/main/ui/static/analysis/partner_card.js index 2302892d7..4496d7ca8 100644 --- a/src/main/ui/static/analysis/partner_card.js +++ b/src/main/ui/static/analysis/partner_card.js @@ -37,7 +37,7 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul $http.get('/analysis/partner_card/' + clientMoniker + '/basic_info').then(function (resp) { $scope.basicinfo = resp.data; if ($scope.basicinfo.logo_url == null) { - $scope.basicinfo.logo_url = "/static/images/logo640x640.jpg"; + $scope.basicinfo.logo_url = "/static/images/logo_new.jpg"; } }); } From 188ee72cd08580914dc4b9cd8390d10f562707a4 Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Tue, 6 Mar 2018 17:11:28 +0800 Subject: [PATCH 3/3] fix --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 7 +++++++ .../payment/manage/mappers/payment/OrderMapper.xml | 1 + 2 files changed, 8 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index dd24c77db..71772cc09 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -434,6 +434,13 @@ public class RetailAppServiceImp implements RetailAppService { String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss"); order.put("trade_date", trade_date); order.put("trade_time", trade_time); + //todo + if ("Debit".equals(order.getString("transaction_type"))){ + order.put("currency","AUD"); + } + if ("CNY".equals(order.getString("currency"))){ + order.put("clearing_amount",order.getBigDecimal("total_amount")); + } if (!date_contains.contains(trade_date)) { String re_date = trade_date.replaceAll("-", ""); TradeLogQuery date_query = new TradeLogQuery(); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index 054bd843d..0066484ff 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -637,6 +637,7 @@ select o.order_id, o.client_id, + o.total_amount, o.display_amount, o.customer_payment_amount, o.coupon_payment_amount,