diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerDashboardController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerDashboardController.java index dda589b27..d11025051 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerDashboardController.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerDashboardController.java @@ -55,11 +55,6 @@ public class PartnerDashboardController { public JSONObject transCommon(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner, AnalysisBean partnerAnalysisBean) { return dashboardService.getCommonAnalysis(partner,partnerAnalysisBean); } - @PartnerMapping("{client_moniker}/basic_info") - public JSONObject commonAnalysis(@PathVariable String client_moniker, @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) { - return partnerCardDashboardService.getCommonAnalysis(client_moniker); - } - @PartnerMapping("/trans_type_analysis") public List getTransTypesAnalysis(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner,AnalysisBean partnerAnalysisBean) { JSONObject params = partnerAnalysisBean.toParams("timezone"); diff --git a/src/main/ui/static/dashboard/partner-dashboard.js b/src/main/ui/static/dashboard/partner-dashboard.js index 3c93d7418..c2dea5647 100644 --- a/src/main/ui/static/dashboard/partner-dashboard.js +++ b/src/main/ui/static/dashboard/partner-dashboard.js @@ -642,23 +642,27 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct $scope.pagination = {}; $scope.clientMoniker = $scope.currentUser.client_moniker; $scope.loadDashboard = function () { - loadBasicInfo() loadTransCommon(); getAvgOrderAndCustomer(); + getExchangeRate(); }; $scope.loadDashboard(); - function loadBasicInfo() { - $http.get('/dashboard/partner/' + $scope.clientMoniker + '/basic_info').then(function (resp) { - $scope.basicinfo = resp.data; - }); - } function loadTransCommon() { var params = {begin: $filter('date')(new Date(), 'yyyyMMdd'), end: $filter('date')(new Date(), 'yyyyMMdd')}; $http.get('/dashboard/partner/trans_common',{params:params}).then(function (resp) { $scope.transcommon = resp.data; }); } + function getExchangeRate() { + $http.get('/dashboard/system/exchange_rates', {params: $scope.scales[0].params()}).then(function (resp) { + if (resp.data && resp.data.length > 0) { + $scope.wechat_rate = resp.data[0].Wechat.exchange_rate; + $scope.alipay_rate = resp.data[0].Alipay.exchange_rate; + $scope.exchange_date = resp.data[0].date.substr(0, 10); + } + }); + } function loadTradeAmountInTypes(params) { var tradeInTypeConfig = { chart: { @@ -1061,12 +1065,6 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct $scope.loadSettlementLogs = function (page) { var params = angular.copy($scope.params); - // if (params.datefrom) { - // params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd'); - // } - // if (params.dateto) { - // params.dateto = $filter('date')(params.dateto, 'yyyyMMdd'); - // } params.page = page || $scope.pagination.page || 1; params.limit = 8; $http.get('/dashboard/partner/' + $scope.clientMoniker + '/settlement_logs', {params: params}).then(function (resp) { diff --git a/src/main/ui/static/dashboard/templates/partner_dashboard.html b/src/main/ui/static/dashboard/templates/partner_dashboard.html index 244b84572..fcab9e18b 100644 --- a/src/main/ui/static/dashboard/templates/partner_dashboard.html +++ b/src/main/ui/static/dashboard/templates/partner_dashboard.html @@ -220,7 +220,7 @@
- +
5210 New Customers @@ -250,13 +250,15 @@

Transaction Time Analysis

+
    +
  • Exchange Rate
  • -
    {{basicinfo.rate_value.wechat_rate_value}}%
    +
    {{wechat_rate}}%
    Wechat
  • -
    {{basicinfo.rate_value.ali_rate_value}}%
    +
    {{alipay_rate}}%
    Alipay
@@ -309,9 +311,9 @@
-->
-
+
-
+

Settlement Logs

@@ -365,7 +367,7 @@

交易类型分布-交易量

-