From 25eb4cc11b6d874b8f641f56519e3b19747301db Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 29 Jan 2018 10:05:35 +0800
Subject: [PATCH 1/4]  fixbug

---
 src/main/resources/templates/reports/week_report_partners.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/reports/week_report_partners.html b/src/main/resources/templates/reports/week_report_partners.html
index bbf5e4415..19b2e3ae6 100644
--- a/src/main/resources/templates/reports/week_report_partners.html
+++ b/src/main/resources/templates/reports/week_report_partners.html
@@ -32,7 +32,7 @@
                         <div class="weui-cell__ft" th:text="${partner.amount}"></div>
                     </div>
 
-                    <div th:if="${partner.compare}!=null">
+                    <div th:if="${partner['compare']}!=null">
                         <div class="weui-cell">
                             <div class="weui-cell__bd weui-cell_primary">较上周比较</div>
                             <div class="weui-cell__ft">

From 57b2dba12b1afb4c7a8523691dc3a0b1da5a80ff Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 29 Jan 2018 11:19:04 +0800
Subject: [PATCH 2/4] fixbug

---
 .../manage/signin/core/impls/SignInAccountServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index d7363a34a..b6a861943 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -148,12 +148,12 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
 
     private void validLoginInfo(LoginInfo loginInfo, JSONObject account) {
         if (account == null) {
-            throw new BadRequestException(LocaleSupport.localeMessage("login.error.password"));
+            throw new BadRequestException(LocaleSupport.localeMessage("error.login.password"));
         }
         String salt = account.getString("salt");
         String pwdHash = loginInfo.getPasswordHashed(salt);
         if (!StringUtils.equals(pwdHash, account.getString("password_hash"))) {
-            throw new BadRequestException(LocaleSupport.localeMessage("login.error.password"));
+            throw new BadRequestException(LocaleSupport.localeMessage("error.login.password"));
         }
     }
 

From 7d4eb6333dbb03b69be303dcfae939a7f423f2f2 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 29 Jan 2018 16:55:47 +0800
Subject: [PATCH 3/4] fix~

---
 .../manage/merchants/core/impls/ClientManagerImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 1b1b54812..9eaf09650 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
@@ -1240,8 +1240,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     private void checkModifyRate(JSONObject org,JSONObject configJson,String rateName,String rateValueKey){
         if(configJson.getString("rate_name").equals(rateName)){
             if(org.containsKey(rateValueKey)){
-                if(configJson.getDouble("rate_value").compareTo(org.getDouble(rateValueKey)) > 0){
-                    throw new ForbiddenException("费率参数大于旗下商户最低"+rateName+"费率，请重新输入===>");
+                if(configJson.getDouble("rate_value").compareTo(org.getDouble(rateValueKey)) < 0){
+                    throw new ForbiddenException("费率参数小于旗下商户最低"+rateName+"费率，请重新输入");
                 };
             }
         }
@@ -1249,8 +1249,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     private void checkAddRate(JSONObject config,String channel, String rateKey,JSONObject org,String rateValueKey){
         if(config.containsKey(rateKey)){
             if(org.containsKey(rateValueKey)){
-                if(config.getBigDecimal(rateKey).compareTo(org.getBigDecimal(rateValueKey)) > 0){
-                    throw new ForbiddenException("费率参数大于旗下商户最低"+channel+"费率，请重新输入===>");
+                if(config.getBigDecimal(rateKey).compareTo(org.getBigDecimal(rateValueKey)) < 0){
+                    throw new ForbiddenException("费率参数小于旗下商户最低"+channel+"费率，请重新输入");
                 };
             }
         }

From 59683281f269b243e685859f404ad63e91dad772 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 29 Jan 2018 16:58:01 +0800
Subject: [PATCH 4/4] 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..5aade10ef 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
@@ -1241,6 +1241,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if(configJson.getString("rate_name").equals(rateName)){
             if(org.containsKey(rateValueKey)){
                 if(configJson.getDouble("rate_value").compareTo(org.getDouble(rateValueKey)) < 0){
+
                     throw new ForbiddenException("费率参数小于旗下商户最低"+rateName+"费率，请重新输入");
                 };
             }