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 @@ - +
-

AlipayPlus Logs

+

Alipay+ Logs

-

No Data

- +

No Data

+
@@ -361,7 +361,7 @@ - + @@ -391,23 +391,97 @@
Date Start
+
+ + +
+
+

Alipay+(Online) Logs

+
+
+

No Data

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Date StartDate EndSettle DatePay FeeRefund FeeNet FeePoundageSettlement FeeUnsettledValidation
{{log.net_fee}} +   (System:{{log.sys_net_fee}}) +   (System:{{log.sys_net_fee}}) + {{log.surcharge}} +   (System:{{log.sys_surcharge}}) +   (System:{{log.sys_surcharge}}) + {{log.settlement_fee}} +   (System:{{log.sys_settlement_fee}}) +   (System:{{log.sys_settlement_fee}}) +
+
+