From c501f77d949cf49e86b1bb9eb83733617d910092 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Mon, 27 Sep 2021 09:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=AE=97=E9=AA=8C=E8=AF=81UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/platformrevenue/platformrevenue.js | 32 +++++-
 .../templates/platform_settle_logs.html       | 98 ++++++++++++++++---
 2 files changed, 117 insertions(+), 13 deletions(-)

diff --git a/src/main/ui/static/config/platformrevenue/platformrevenue.js b/src/main/ui/static/config/platformrevenue/platformrevenue.js
index 505b81d96..0f8ac4ef2 100644
--- a/src/main/ui/static/config/platformrevenue/platformrevenue.js
+++ b/src/main/ui/static/config/platformrevenue/platformrevenue.js
@@ -65,7 +65,31 @@ define(['angular', 'decimal', 'uiRouter', 'angularEcharts', '../../analysis/repo
         })
       }
       $scope.loadAliOnlineLogs(1)
-      $scope.loadBestpayLog = function () {
+
+        $scope.loadAlipayApsInStoreLogs = function (page) {
+            var params = $scope.queryParams || {}
+            params.page = page || $scope.apsInStorePagination.page || 1
+            params.limit = 20
+            params.channel = 'ApsInStore'
+            $http.get('/platform/analysis/settle/log', { params: params }).then(function (resp) {
+                $scope.apsInStoreLogs = resp.data.data
+                $scope.apsInStorePagination = resp.data.pagination
+            })
+        }
+        $scope.loadAlipayApsInStoreLogs(1)
+        $scope.loadAlipayApsCashierLogs = function (page) {
+            var params = $scope.queryParams || {}
+            params.page = page || $scope.apsCashierPagination.page || 1
+            params.limit = 20
+            params.channel = 'ApsCashier'
+            $http.get('/platform/analysis/settle/log', { params: params }).then(function (resp) {
+                $scope.apsCashierLogs = resp.data.data
+                $scope.apsCashierPagination = resp.data.pagination
+            })
+        }
+        $scope.loadAlipayApsCashierLogs(1)
+
+        $scope.loadBestpayLog = function () {
         $http.get('/platform/analysis/settle/Bestpay').then(function (resp) {
           $scope.bestpayLogs = resp.data
         })
@@ -77,6 +101,9 @@ define(['angular', 'decimal', 'uiRouter', 'angularEcharts', '../../analysis/repo
             $scope.loadAliLogs(1)
             $scope.loadAliOnlineLogs(1)
             $scope.loadWechatLogs(1)
+            $scope.loadAlipayApsInStoreLogs(1)
+            $scope.loadAlipayApsCashierLogs(1)
+
             commonDialog.alert({
               title: 'Success',
               content: '校验结果已经重新生成,请查看！',
@@ -97,6 +124,9 @@ define(['angular', 'decimal', 'uiRouter', 'angularEcharts', '../../analysis/repo
         $http.get('/platform/analysis/generate/settle/log').then(function () {
           $scope.loadWechatLogs(1)
           $scope.loadAliLogs(1)
+            $scope.loadAlipayApsInStoreLogs(1)
+            $scope.loadAlipayApsCashierLogs(1)
+
           $state.reload()
         })
         $state.reload()
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 8ce8f87e2..368fb8218 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
@@ -338,14 +338,14 @@
         </div>
     </div>
 </div>
-<!--AlipayPlus (aps) -->
+<!--Alipay+ (aps) -->
 <div class="box box-warning">
     <div class="box-header">
-        <h4 class="text-green">AlipayPlus Logs</h4>
+        <h4 class="text-green">Alipay+ Logs</h4>
     </div>
     <div class="box-body table-responsive">
-        <p ng-if="!wechatLogs.length">No Data</p>
-        <table class="table table-hover" ng-if="wechatLogs.length">
+        <p ng-if="!apsInStoreLogs.length">No Data</p>
+        <table class="table table-hover" ng-if="apsInStoreLogs.length">
             <thead>
             <tr>
                 <th>Date Start</th>
@@ -361,7 +361,7 @@
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="log in wechatLogs">
+            <tr ng-repeat="log in apsInStoreLogs">
                 <td ng-bind="log.start_date.substr(0,10)"></td>
                 <td ng-bind="log.end_date.substr(0,10)"></td>
                 <td ng-bind="log.settle_date.substr(0,10)"></td>
@@ -391,23 +391,97 @@
         </table>
         <div class="panel-footer">
             <div class="row">
-                <uib-pagination ng-if="wechatLogs.length"
+                <uib-pagination ng-if="apsInStoreLogs.length"
                                 class="pagination"
-                                total-items="wechatPagination.totalCount"
+                                total-items="apsInStorePagination.totalCount"
                                 boundary-links="true"
-                                ng-model="wechatPagination.page"
-                                items-per-page="wechatPagination.limit"
+                                ng-model="apsInStorePagination.page"
+                                items-per-page="apsInStorePagination.limit"
                                 max-size="10"
-                                ng-change="loadWechatLogs()"
+                                ng-change="loadAlipayApsInStoreLogs()"
                                 previous-text="&lsaquo;"
                                 next-text="&rsaquo;"
                                 first-text="&laquo;"
                                 last-text="&raquo;"></uib-pagination>
-                <div class="col-xs-12">Total Records:{{wechatPagination.totalCount}};Total
-                    Pages:{{wechatPagination.totalPages}}
+                <div class="col-xs-12">Total Records:{{apsInStorePagination.totalCount}};Total
+                    Pages:{{apsInStorePagination.totalPages}}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--Alipay+(Online) (aps) -->
+
+<div class="box box-warning">
+    <div class="box-header">
+        <h4 class="text-green">Alipay+(Online) Logs</h4>
+    </div>
+    <div class="box-body table-responsive">
+        <p ng-if="!apsCashierLogs.length">No Data</p>
+        <table class="table table-hover" ng-if="apsCashierLogs.length">
+            <thead>
+            <tr>
+                <th>Date Start</th>
+                <th>Date End</th>
+                <th>Settle Date</th>
+                <th>Pay Fee</th>
+                <th>Refund Fee</th>
+                <th>Net Fee</th>
+                <th>Poundage</th>
+                <th>Settlement Fee</th>
+                <th>Unsettled</th>
+                <th style="text-align: center;">Validation</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr ng-repeat="log in apsCashierLogs">
+                <td ng-bind="log.start_date.substr(0,10)"></td>
+                <td ng-bind="log.end_date.substr(0,10)"></td>
+                <td ng-bind="log.settle_date.substr(0,10)"></td>
+                <td ng-bind="log.pay_fee"></td>
+                <td ng-bind="log.refund_fee"></td>
+                <td>{{log.net_fee}}
+                    <span ng-if="log.sys_net_fee==log.net_fee" style="color: #0BB20C">&nbsp;&nbsp;(System:{{log.sys_net_fee}})</span>
+                    <span ng-if="log.sys_net_fee!=log.net_fee" style="color: crimson">&nbsp;&nbsp;(System:{{log.sys_net_fee}})</span>
+                </td>
+                <td>{{log.surcharge}}
+                    <span ng-if="log.sys_surcharge==log.surcharge" style="color: #0BB20C">&nbsp;&nbsp;(System:{{log.sys_surcharge}})</span>
+                    <span ng-if="log.sys_surcharge!=log.surcharge" style="color: crimson">&nbsp;&nbsp;(System:{{log.sys_surcharge}})</span>
+                </td>
+                <td>{{log.settlement_fee}}
+                    <span ng-if="log.sys_settlement_fee==log.settlement_fee" style="color: #0BB20C">&nbsp;&nbsp;(System:{{log.sys_settlement_fee}})</span>
+                    <span ng-if="log.sys_settlement_fee!=log.settlement_fee" style="color: crimson">&nbsp;&nbsp;(System:{{log.sys_settlement_fee}})</span>
+                </td>
+                <td ng-bind="log.unsettle_fee"></td>
+                <td ng-if="log.sys_settlement_fee==log.settlement_fee" style="font-size:25px;text-align: center;"><a
+                        role="button" ng-click="verifySettleLog(log)"><i
+                        class="fa fa-check-circle text-green" uib-tooltip="校验通过"></i></a></td>
+                <td ng-if="log.sys_settlement_fee!=log.settlement_fee" style="font-size:25px;text-align: center;"><a
+                        role="button" ng-click="verifySettleLog(log)"><i
+                        class="fa fa-exclamation-circle text-red" uib-tooltip="校验未通过:点击重新验证"></i></a></td>
+            </tr>
+            </tbody>
+        </table>
+        <div class="panel-footer">
+            <div class="row">
+                <uib-pagination ng-if="apsCashierLogs.length"
+                                class="pagination"
+                                total-items="apsCashierPagination.totalCount"
+                                boundary-links="true"
+                                ng-model="apsCashierPagination.page"
+                                items-per-page="apsCashierPagination.limit"
+                                max-size="10"
+                                ng-change="loadAlipayApsCashierLogs()"
+                                previous-text="&lsaquo;"
+                                next-text="&rsaquo;"
+                                first-text="&laquo;"
+                                last-text="&raquo;"></uib-pagination>
+                <div class="col-xs-12">Total Records:{{apsCashierPagination.totalCount}};Total
+                    Pages:{{apsCashierPagination.totalPages}}
                 </div>
             </div>
         </div>
     </div>
 </div>
+
 </div>