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

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.41</version>
+    <version>2.3.43</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

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

@@ -7052,8 +7052,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         info.put("legal_bussiness", legalInfo.getString("representative_person") + " AS " + (client.containsKey("business_name") ? client.getString("business_name") : legalInfo.getString("representative_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码
         info.put("annual_rate", cardAnnualRate);//年费率
         info.put("cost_per_transaction", clientRate.getString("transaction_fee"));//每次交易成本
-        info.put("domestic_fee", cardRate.getString("domestic_rate_value"));//国内服务费
+        String domesticRateValue = cardRate.getString("domestic_rate_value");
-        info.put("international_fee", upayProfileInfo.getBoolean("enable_international_card") ? cardRate.getString("overseas_rate_value") : "-");//国际服务费
+        info.put("domestic_fee", domesticRateValue.indexOf("rate")!= -1?JSONObject.parseObject(domesticRateValue).getString("rate"):cardRate.getString("domestic_rate_value"));//国内服务费
+        String overseasRateValue = cardRate.getString("overseas_rate_value");
+        info.put("international_fee", upayProfileInfo.getBoolean("enable_international_card") ?
+                overseasRateValue.indexOf("rate")!=-1?JSONObject.parseObject(overseasRateValue).getString("rate"):cardRate.getString("overseas_rate_value") : "-");//国际服务费
         BigDecimal reserve = (upayProfileInfo.getBigDecimal("expected_card_revenue").multiply(new BigDecimal(0.005)).setScale(0, RoundingMode.HALF_UP));
         info.put("account_reserve", reserve.compareTo(new BigDecimal(200)) <= 0 ? new BigDecimal(200).toPlainString() : reserve.toPlainString());//账户储备金
         //银行账号信息

src/main/ui/static/boot/indexMainApp.js

@@ -69,7 +69,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     if ($scope.currentUser.role == 1 || $scope.currentUser.role == 2) {
                         $scope.getAgStatus();
                     }
-
+                    $scope.loadPartnerNotice();
                 }, function (resp) {
                     if (resp.status == 403) {
                         location.href = 'login.html?f=' + encodeURIComponent(location.href);
@@ -100,7 +100,6 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     }
                 })
             };
-            $scope.loadPartnerNotice();
 
             $scope.loadSignEvents = function () {
                 $http.get('/client/partner_info/sign_events').then(function (resp) {