Merge remote-tracking branch 'origin/develop' into develop

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

@@ -1240,8 +1240,9 @@ 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 +1250,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+"费率，请重新输入");
                 };
             }
         }

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"));
         }
     }
 

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">