From 466cf2f4b30957c95e3693106bd205654c1a7c2a Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 29 Jul 2020 12:51:57 +1000
Subject: [PATCH] live check optmise

---
 pom.xml                                                   | 2 +-
 .../manage/analysis/core/impls/ATOReportServiceImpl.java  | 4 ++--
 .../manage/merchants/core/impls/ClientManagerImpl.java    | 8 ++++----
 .../static/analysis/templates/yesterday_trans_report.html | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index bf22c8244..4c9989945 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.2.7</version>
+        <version>2.2.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ATOReportServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ATOReportServiceImpl.java
index 11bcf38c6..36d51fe04 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ATOReportServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ATOReportServiceImpl.java
@@ -259,7 +259,7 @@ public class ATOReportServiceImpl implements ATOReportService {
     }
 
     public static class Progress {
-        private static final Logger logger = LoggerFactory.getLogger(ATOReportService.class);
+        private static final Logger logger = LoggerFactory.getLogger(Progress.class);
         private String brand;
         private String currentMonth;
         private Map<Integer, Boolean> clientsStatus;
@@ -271,7 +271,7 @@ public class ATOReportServiceImpl implements ATOReportService {
 
         public Progress() {
             status = "Init";
-            server = PlatformEnvironment.getEnv().appName();
+            server = PlatformEnvironment.getEnv().appName(true);
         }
 
         public String getBrand() {
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 337e112b4..6e6f13c8b 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
@@ -7067,11 +7067,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         info.put("annual_rate", cardAnnualRate);//年费率
         info.put("cost_per_transaction", clientRate.getString("transaction_fee"));//每次交易成本
         String domesticRateValue = cardRate.getString("domestic_rate_value");
-        info.put("domestic_fee", domesticRateValue.indexOf("rate") != -1 ? JSONObject.parseObject(domesticRateValue).getString("rate") : cardRate.getString("domestic_rate_value"));//国内服务费
+        info.put("domestic_fee", domesticRateValue.contains("rate") ? JSON.parseObject(domesticRateValue).getString("rate") : domesticRateValue);//国内服务费
         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("international_fee", upayProfileInfo.getBooleanValue("enable_international_card") ?
+                overseasRateValue.contains("rate") ? JSON.parseObject(overseasRateValue).getString("rate") : overseasRateValue : "-");//国际服务费
+        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());//账户储备金
         //银行账号信息
         info.put("account_name", bankAccountInfo.getString("account_name"));//
diff --git a/src/main/ui/static/analysis/templates/yesterday_trans_report.html b/src/main/ui/static/analysis/templates/yesterday_trans_report.html
index 82697ceec..691bc633b 100644
--- a/src/main/ui/static/analysis/templates/yesterday_trans_report.html
+++ b/src/main/ui/static/analysis/templates/yesterday_trans_report.html
@@ -2,7 +2,7 @@
     Yesterday Transaction Analysis
 </div>
 <div class="modal-body">
-    <table class="table-bordered table-striped table-hover">
+    <table class="table table-bordered table-striped table-hover">
         <thead>
         <tr>
             <th>Channel</th>
@@ -20,5 +20,5 @@
     </table>
 </div>
 <div class="modal-footer">
-    <button type="button" class="btn btn-danger"><i class="fa fa-close"></i> Close</button>
+    <button type="button" class="btn btn-danger" ng-click="$dismiss()"><i class="fa fa-close"></i> Close</button>
 </div>
\ No newline at end of file