From fda28110b0b21ef0372916ceb5fae578fc1ae40b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 25 Feb 2019 18:57:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E6=B8=85=E7=AE=97=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=20=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platformrevenue/templates/platform_settle_logs.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/config/platformrevenue/templates/platform_settle_logs.html b/src/main/ui/static/config/platformrevenue/templates/platform_settle_logs.html
index fdff48e0d..ffc5df6cb 100644
--- a/src/main/ui/static/config/platformrevenue/templates/platform_settle_logs.html
+++ b/src/main/ui/static/config/platformrevenue/templates/platform_settle_logs.html
@@ -202,7 +202,7 @@
         <h4 class="text-blue">AlipayOnline Logs</h4>
     </div>
     <div class="box-body table-responsive">
-        <p ng-if="!aliLogs.length">No Data</p>
+        <p ng-if="!aliOnlineLogs.length">No Data</p>
         <table class="table table-hover table-striped" ng-if="aliLogs.length">
             <thead>
             <tr>
@@ -253,7 +253,7 @@
         </table>
         <div class="panel-footer">
             <div class="row">
-                <uib-pagination ng-if="aliOnlieLogs.length"
+                <uib-pagination ng-if="aliOnlineLogs.length"
                                 class="pagination"
                                 total-items="aliOnlinePagination.totalCount"
                                 boundary-links="true"

From 8cf08d00266d8c68f23b5061a0b5d9fa58571a3f Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Tue, 26 Feb 2019 11:30:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?alipay=5Fonline=E6=B8=85=E7=AE=97=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E8=B4=B9=E7=8E=87=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/PlatformClearAnalysisServiceImpl.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java
index 83a03f191..ac6361e32 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java
@@ -352,6 +352,13 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
             wechat_rate = new BigDecimal("0.005");
         }
 
+        // 2018-09-01后Alipay_Online手续费0.006
+        BigDecimal alipay_online_rate;
+        if (end_date.compareTo("2018-09-01 02:00:00") <= 0) {
+            alipay_online_rate = new BigDecimal("0.018");
+        } else {
+            alipay_online_rate = new BigDecimal("0.006");
+        }
         try {
             JSONObject creditLogs = platformSettlementMapper.calculateSysSettleLog(start_date, end_date, channel, "Credit", wechat_rate);
             sysLogs.put("sys_pay_fee", creditLogs.getBigDecimal("aud_amount"));
@@ -363,7 +370,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
             if (StringUtils.equals("Alipay", channel)) {
                 sysLogs.put("sys_surcharge", platformSettlementMapper.calculateRmbCharge(start_date, end_date, channel, new BigDecimal(0.006)));
             } else if (StringUtils.equals("AlipayOnline", channel)) {
-                sysLogs.put("sys_surcharge", platformSettlementMapper.calculateRmbCharge(start_date, end_date, channel, new BigDecimal(0.018)));
+                sysLogs.put("sys_surcharge", platformSettlementMapper.calculateRmbCharge(start_date, end_date, channel, alipay_online_rate));
             } else {
                 sysLogs.put("sys_surcharge", creditLogs.getBigDecimal("charge_amount").subtract(debitLogs.getBigDecimal("charge_amount")));
             }