Merge branch 'develop'

master
Tayl0r 7 years ago
commit 599864897f

@ -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.organizations.core.OrgManager;
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.manage.permission.manager.RequirePartner;
import au.com.royalpay.payment.tools.CommonConsts;
@ -24,6 +25,9 @@ public class DashboardController {
@Resource
private OrgManager orgManager;
@Resource
private SysConfigManager sysConfigManager;
@ManagerMapping("/common_analysis_1")
public JSONObject commonAnalysis1(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
@ -140,4 +144,14 @@ public class DashboardController {
orgManager.checkOrg(manager,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() {
$http.get('/sysconfig/base').then(function (resp) {
$http.get('/dashboard/system/dashboard_base').then(function (resp) {
$scope.wechat_paymentconfig = resp.data;
$scope.htmlTooltip = $sce.trustAsHtml('<div style="width: 250px">' +
'<h5>Transaction Limit</h5>'+'<div style="background-color: #EFEFF5;height: 1px;margin-bottom: 10px;"></div>'+

@ -204,7 +204,7 @@ input.value:focus {
}
.logo-box {
margin-bottom: 280px;
margin-bottom: 50px;
}
.logo-small {
@ -392,7 +392,6 @@ input.value:focus {
padding: 0;
margin-top: 10px;
background: #fff;
position: fixed;
bottom: 0;
}
@ -458,7 +457,7 @@ input.value:focus {
text-align: center;
line-height: 20px;
font-size: 24px;
position: fixed;
/* position: fixed; */
width: 100%;
padding-top: 5px;
padding-bottom: 10px;

Loading…
Cancel
Save