From 9cdc0012b14402a6eef3a8ac838e8a60c3970b11 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Mon, 29 Jan 2018 17:01:20 +0800 Subject: [PATCH 1/3] fix~ --- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 1 + 1 file changed, 1 insertion(+) 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 9eaf09650..a2814d7ee 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 @@ -1250,6 +1250,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if(config.containsKey(rateKey)){ if(org.containsKey(rateValueKey)){ if(config.getBigDecimal(rateKey).compareTo(org.getBigDecimal(rateValueKey)) < 0){ + throw new ForbiddenException("费率参数小于旗下商户最低"+channel+"费率，请重新输入"); }; } From 1bdcf5fa524b10ba1f0ca4bee311d0514bf318ef Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Tue, 30 Jan 2018 10:33:54 +0800 Subject: [PATCH 2/3] fix --- src/main/ui/static/dashboard/dashboard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js index ab4cd5007..1ed933040 100644 --- a/src/main/ui/static/dashboard/dashboard.js +++ b/src/main/ui/static/dashboard/dashboard.js @@ -155,9 +155,9 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul $scope.wechat_paymentconfig = resp.data; $scope.htmlTooltip = $sce.trustAsHtml('
' + '
Transaction Limit
'+'
'+ - '

Max Amount of Per Order:'+$scope.wechat_paymentconfig.dashboard_wechat_per_order_limit+'

' + - '

Max amount of individual limit Daily:'+$scope.wechat_paymentconfig.dashboard_wechat_individual_daily_limit+'

' + - '

Max amount of individual limit yearly:'+$scope.wechat_paymentconfig.dashboard_wechat_individual_yearly_limit+'

'+ + '

Max Amount of Per Order:'+$scope.wechat_paymentconfig['payment.wechat.per_order_limit']+'

' + + '

Max amount of individual limit Daily:'+$scope.wechat_paymentconfig['payment.wechat.individual_daily_limit']+'

' + + '

Max amount of individual limit yearly:'+$scope.wechat_paymentconfig['payment.wechat.individual_yearly_limit']+'

'+ '
'); }) } From 5168d717f8f939d36b5990307511278f019799f3 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 30 Jan 2018 12:14:04 +0800 Subject: [PATCH 3/3] fixbug change pwd --- .../resources/templates/change_password.html | 170 ++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 src/main/resources/templates/change_password.html diff --git a/src/main/resources/templates/change_password.html b/src/main/resources/templates/change_password.html new file mode 100644 index 000000000..889f760ca --- /dev/null +++ b/src/main/resources/templates/change_password.html @@ -0,0 +1,170 @@ + + + + RoyalPay - Change Passowrd + + + + + + + + + + + + + + + + + +
+
+
+ + +
+
+ +
+
+ + +
+
+ +