dashboard增加获取支付限额接口

master
yuan 7 years ago
parent 56290c7bdb
commit abce303d14

@ -4,6 +4,7 @@ import au.com.royalpay.payment.manage.analysis.beans.AnalysisBean;
import au.com.royalpay.payment.manage.analysis.core.DashboardService; import au.com.royalpay.payment.manage.analysis.core.DashboardService;
import au.com.royalpay.payment.manage.organizations.core.OrgManager; import au.com.royalpay.payment.manage.organizations.core.OrgManager;
import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
import au.com.royalpay.payment.tools.env.SysConfigManager;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import au.com.royalpay.payment.manage.permission.manager.RequirePartner; import au.com.royalpay.payment.manage.permission.manager.RequirePartner;
import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.CommonConsts;
@ -24,6 +25,9 @@ public class DashboardController {
@Resource @Resource
private OrgManager orgManager; private OrgManager orgManager;
@Resource
private SysConfigManager sysConfigManager;
@ManagerMapping("/common_analysis_1") @ManagerMapping("/common_analysis_1")
public JSONObject commonAnalysis1(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { public JSONObject commonAnalysis1(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
@ -140,4 +144,14 @@ public class DashboardController {
orgManager.checkOrg(manager,params); orgManager.checkOrg(manager,params);
return dashboardService.getPlatformAmount(params); return dashboardService.getPlatformAmount(params);
} }
@ManagerMapping(value = "/dashboard_base", method = RequestMethod.GET)
public JSONObject getDashBoardBaseConfig() {
JSONObject config = sysConfigManager.getSysConfig();
JSONObject limits = new JSONObject();
limits.put("payment.wechat.per_order_limit",config.getString("payment.wechat.per_order_limit"));
limits.put("payment.wechat.individual_daily_limit",config.getString("payment.wechat.individual_daily_limit"));
limits.put("payment.wechat.individual_yearly_limit",config.getString("payment.wechat.individual_yearly_limit"));
return limits;
}
} }

@ -151,7 +151,7 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
}); });
} }
function loadTradeLimite() { function loadTradeLimite() {
$http.get('/sysconfig/base').then(function (resp) { $http.get('/dashboard/system/dashboard_base').then(function (resp) {
$scope.wechat_paymentconfig = resp.data; $scope.wechat_paymentconfig = resp.data;
$scope.htmlTooltip = $sce.trustAsHtml('<div style="width: 250px">' + $scope.htmlTooltip = $sce.trustAsHtml('<div style="width: 250px">' +
'<h5>Transaction Limit</h5>'+'<div style="background-color: #EFEFF5;height: 1px;margin-bottom: 10px;"></div>'+ '<h5>Transaction Limit</h5>'+'<div style="background-color: #EFEFF5;height: 1px;margin-bottom: 10px;"></div>'+

Loading…
Cancel
Save