msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

temp commit add org_detail 70%

Browse Source
master
luoyang 6 years ago
parent 2ef721ea08
commit 28742dae95
8 changed files with 618 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
Unescape View File

@ -35,6 +35,8 @@ public interface DashboardService {
List<JSONObject> getTradeAnalysisInDays(JSONObject params);
List<JSONObject> getClientsTradeAnalysisInDays(JSONObject params);
JSONObject getCommonAnalysis(JSONObject partner, AnalysisBean partnerAnalysisBean);
List<JSONObject> getTradeAnalysisInHours(JSONObject partner, AnalysisBean partnerAnalysisBean);

8
src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
Unescape View File

@ -288,6 +288,14 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
return customerAndOrdersStatisticsMapper.getSumCustomersAnalysis(params);
}
@Override
public List<JSONObject> getClientsTradeAnalysisInDays(JSONObject params) {
if (!params.containsKey("client_ids") && !params.containsKey("org_id")) {
params.put("client_id", 0);
}
return clientAnalysisMapper.listNewClients(params);
}
@Override
public JSONObject getCommonAnalysis(JSONObject partner, AnalysisBean partnerAnalysisBean) {
String timezone = partner.getJSONObject("client").getString("timezone");

3
src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
Unescape View File

@ -25,6 +25,9 @@ public interface ClientAnalysisMapper {
// 统计所有的商户，包括禁用的
int countClientsAll(JSONObject params);
// 统计一段时期新增的商户数
List<JSONObject> listNewClients(JSONObject params);
@AutoSql(type = SqlType.COUNT)
@AdvanceSelect(addonWhereClause = "sub_merchant_id is not null")
int countTotalPartners();

7
src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
Unescape View File

@ -107,6 +107,13 @@ public class DashboardController {
return dashboardService.getTradeAnalysisInDays(params);
}
@ManagerMapping("/new_clients")
public List<JSONObject> clientsTradeInDays(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
JSONObject params = analysis.toParams(null);
orgManager.checkOrg(manager,params);
return dashboardService.getClientsTradeAnalysisInDays(params);
}
@ManagerMapping("/partners_in_types")
public List<JSONObject> partnersInTypes(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
JSONObject params = analysis.toParams(analysis.getTimezone());

13
src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
Unescape View File

@ -53,6 +53,19 @@
<foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
</select>
<select id="listNewClients" resultType="com.alibaba.fastjson.JSONObject">
<![CDATA[
SELECT count(client_id) new_clients,DATE_FORMAT(date(create_time),'%Y-%m-%d') create_time
FROM sys_clients
WHERE
create_time >= #{begin} AND create_time <= #{end} and (approve_result is null or approve_result !=0)
]]>
<if test="org_id!=null and org_ids==null">and org_id=#{org_id}</if>
<if test="org_ids!=null">and org_id in
<foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
GROUP BY YEAR(create_time),MONTH(create_time),DAY(create_time)
</select>
<select id="countClients" resultType="java.lang.Integer">
<![CDATA[
SELECT count(client_id)

327
src/main/ui/static/config/organizations/organizations.js
Unescape View File

@ -3,6 +3,7 @@
*/
define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
'use strict';
var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
var types = [{
"label": "城市合伙人",
@ -85,7 +86,121 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
};
$scope.listOrgs(1);
}]);
app.controller('orgDetailCtrl', ['$scope', '$http', '$state', 'Upload', '$uibModal','commonDialog', 'org','stateMap', function ($scope, $http, $state, Upload,$uibModal,commonDialog, org,stateMap) {
app.controller('orgDetailCtrl', ['$scope', '$http', '$state', 'Upload', '$filter','$uibModal','commonDialog','chartParser', 'org','stateMap', function ($scope, $http, $state, Upload,$filter,$uibModal,commonDialog, chartParser,org,stateMap) {
$scope.analysis = {};
$scope.today = new Date();
$scope.chooseToday = function () {
$scope.params.begin = $scope.params.end = new Date();
$scope.loadTransactionAmountInOrg();
};
$scope.chooseYesterday = function () {
var yesterday = new Date();
yesterday.setDate(yesterday.getDate() - 1);
$scope.params.begin = $scope.params.end = yesterday;
$scope.loadTransactionAmountInOrg();
};
$scope.chooseLast7Days = function () {
$scope.params.end = new Date();
var day = new Date();
day.setDate(day.getDate() - 7);
$scope.params.begin = day;
$scope.loadTransactionAmountInOrg();
};
$scope.thisMonth = function () {
$scope.params.end = new Date();
var monthBegin = new Date();
monthBegin.setDate(1);
$scope.params.begin = monthBegin;
$scope.loadTransactionAmountInOrg();
};
$scope.lastMonth = function () {
var monthFinish = new Date();
monthFinish.setDate(0);
$scope.params.end = monthFinish;
var monthBegin = new Date();
monthBegin.setDate(0);
monthBegin.setDate(1);
$scope.params.begin = monthBegin;
$scope.loadTransactionAmountInOrg();
};
$scope.thisYear = function () {
var yearFinish = new Date();
$scope.params.end = yearFinish;
var currentYearFirstDate = new Date(new Date().getFullYear(), 0, 1);
$scope.params.begin = currentYearFirstDate;
$scope.loadTransactionAmountInOrg();
};
$scope.scales = [
{
key: 'today',
label: '今日',
params: function () {
return {
begin: $filter('date')(new Date(), 'yyyyMMdd'),
end: $filter('date')(new Date(), 'yyyyMMdd'),
timezone: jstz.determine().name()
}
}
},
{
key: 'yesterday',
label: '昨日',
params: function () {
var date = new Date();
date = date.setDate(date.getDate() - 1);
return {
begin: $filter('date')(date, 'yyyyMMdd'),
end: $filter('date')(date, 'yyyyMMdd')
}
}
},
{
key: 'seven',
label: '近7日',
params: function () {
var date = new Date();
var end = $filter('date')(date, 'yyyyMMdd');
date = date.setDate(date.getDate() - 6);
return {
begin: $filter('date')(date, 'yyyyMMdd'),
end: end
}
}
},
{
key: 'month',
label: '本月',
params: function () {
var date = new Date();
var end = $filter('date')(date, 'yyyyMMdd');
date = date.setDate(1);
return {
begin: $filter('date')(date, 'yyyyMMdd'),
end: end
}
}
},
{
key: 'lastmonth',
label: '上月',
params: function () {
var date = new Date();
date = date.setDate(1);
var oneDay=1000*60*60*24;
var end = $filter('date')(date-oneDay, 'yyyyMMdd');
var date2 = new Date();
date2.setDate(1);
date2.setMonth(date2.getMonth() - 1);
var begin = $filter('date')(date2, 'yyyyMMdd');
return {
begin: begin,
end: end
}
}
}
];
$scope.types = angular.copy(types);
$scope.states = stateMap.configs();
$scope.commission_types = angular.copy(commission_types);
@ -104,6 +219,210 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
};
$scope.loadSeniorOrg(1);
$scope.loadPartners = function (page) {
var params = angular.copy($scope.params);
params.page = page || $scope.pagination.page || 1;
params.org_id = $scope.org.org_id;
$http.get('/sys/partners', {params: params}).then(function (resp) {
$scope.partners = resp.data.data;
$scope.pagination = resp.data.pagination;
});
};
$scope.loadTransactionAmountInOrg = function () {
$scope.future_loading = true;
var params = angular.copy($scope.params);
if (params.begin) {
params.begin = $filter('date')(params.begin, 'yyyyMMdd');
} else {
params.begin = $filter('date')('2016-01-01', 'yyyyMMdd');
}
if (params.end) {
params.end = $filter('date')(params.end, 'yyyyMMdd');
} else {
params.end = $filter('date')(new Date(), 'yyyyMMdd');
}
params.org_id = $scope.org.org_id;
$http.get('/analysis/org/sales', {params: params}).then(function (resp) {
$scope.orgAmounts = resp.data;
$scope.legends = [];
for (var i = 0; i < resp.data.length; i++) {
$scope.legends[i] = resp.data[i].org_name;
}
if($scope.orgAmounts.length >= 1){
$scope.chooseOrg = resp.data[0].org_name;
loadPartnersByOrgId(resp.data[0].org_id);
}
$scope.future_loading = false;
});
};
function loadPartnersByOrgId(org_id) {
var params = angular.copy($scope.params);
if (params.begin) {
params.begin = $filter('date')(params.begin, 'yyyyMMdd');
} else {
params.begin = $filter('date')('2016-01-01', 'yyyyMMdd');
}
if (params.end) {
params.end = $filter('date')(params.end, 'yyyyMMdd');
} else {
params.end = $filter('date')(new Date(), 'yyyyMMdd');
}
$http.get('/analysis/org/'+org_id+'/partners', {params: params}).then(function (resp) {
$scope.salespartners = resp.data;
$scope.partnerSales1 = [];
$scope.partnerSales2 = [];
$scope.partnerSalesList = [];
var partnerSales = angular.copy($scope.salespartners);
var partnerSalesSize = 0;
if (partnerSales.length % 2 == 0) {
partnerSalesSize = partnerSales.length / 2;
} else {
partnerSalesSize = (partnerSales.length + 1) / 2
}
for (var i = 0; i < partnerSalesSize; i++) {
var item = [];
item[0] = partnerSales[i * 2];
if (i * 2 - 1 < partnerSales.length) {
item[1] = partnerSales[i * 2 + 1];
}
$scope.partnerSalesList[i] = item;
}
$scope.future_loading = false;
});
}
$scope.reloadTrade = function () {
loadFeeAnalysis($scope.scales[2].params());
loadNewClientAnalysis($scope.scales[2].params());
};
$scope.chooseLast7Days();
//$scope.loadTransactionAmountInOrg();
function loadFeeAnalysis(params) {
var analysisConfig = {
chart: {
tooltip: {
trigger: 'axis',
formatter: '{b}:AUD {c}'
},
toolbox: {
show: true,
feature: {
mySeven: {
title: '最近7天',
show: true,
icon: 'path://M3.59-4.07L32.38-4.07L32.38 0.04Q22.25 25.11 17.19 46.34L10.65 46.34Q16.14 26.94 26.19 1.41L3.59 1.41L3.59-4.07Z',
onclick: function () {
loadFeeAnalysis($scope.scales[2].params())
}
},
myThirty: {
title: '最近30天',
show: true,
icon: 'path://M12.52 17.02L16.10 17.02Q20.71 17.02 22.43 15.72Q25.66 13.23 25.66 8.23Q25.66-0.63 17.61-0.63Q10.93-0.63 9.42 6.93L3.73 6.93Q4.50 2.19 7.03-0.91Q10.90-5.51 17.61-5.51Q23.24-5.51 26.89-2.28Q31.22 1.52 31.22 8.02Q31.22 16.78 23.38 19.48Q32.84 23.14 32.84 32.81Q32.84 39.00 29.32 42.97Q25.10 47.79 17.72 47.79Q10.79 47.79 6.68 43.04Q3.66 39.56 3.02 33.44L8.93 33.44Q9.67 42.83 17.72 42.83Q21.45 42.83 23.98 40.72Q27.14 38.01 27.14 32.81Q27.14 21.63 16.10 21.63L12.52 21.63L12.52 17.02ZM54-5.51Q67.99-5.51 67.99 21.14Q67.99 47.79 54 47.79Q40.04 47.79 40.04 21.14Q40.04-5.51 54-5.51M46.97 33.65L59.84 4.30Q57.80-0.55 53.93-0.55Q45.95-0.55 45.95 21.14Q45.95 28.52 46.97 33.65M48.16 37.91Q50.13 42.83 54 42.83Q62.09 42.83 62.09 21.07Q62.09 13.86 61.07 8.66L48.16 37.91Z',
onclick: function () {
var params = {};
var dt = new Date();
params.end = $filter('date')(dt, 'yyyyMMdd');
dt.setDate(dt.getDate() - 29);
params.begin = $filter('date')(dt, 'yyyyMMdd');
loadFeeAnalysis(params)
}
}
}
},
yAxis: {
type: 'value',
name: '交易金额(AUD)'
},
color: colors
},
xAxis: {
basic: {
type: 'category',
boundaryGap: false
},
key: 'trade_date'
},
series: [
{
basic: {type: 'line', label: {normal: {show: true}}, showAllSymbols: true},
column: {key: 'total'}
}
]
};
params.org_id = $scope.org.org_id;
$http.get('/dashboard/system/fee_analysis', {params: params}).then(function (resp) {
$scope.analysis.trade_line = chartParser.parse(analysisConfig, resp.data.reverse());
})
}
function loadNewClientAnalysis(params) {
var analysisConfig = {
chart: {
tooltip: {
trigger: 'axis',
formatter: '新增商户数'
},
toolbox: {
show: true,
feature: {
mySeven: {
title: '最近7天',
show: true,
icon: 'path://M3.59-4.07L32.38-4.07L32.38 0.04Q22.25 25.11 17.19 46.34L10.65 46.34Q16.14 26.94 26.19 1.41L3.59 1.41L3.59-4.07Z',
onclick: function () {
loadNewClientAnalysis($scope.scales[2].params())
}
},
myThirty: {
title: '最近30天',
show: true,
icon: 'path://M12.52 17.02L16.10 17.02Q20.71 17.02 22.43 15.72Q25.66 13.23 25.66 8.23Q25.66-0.63 17.61-0.63Q10.93-0.63 9.42 6.93L3.73 6.93Q4.50 2.19 7.03-0.91Q10.90-5.51 17.61-5.51Q23.24-5.51 26.89-2.28Q31.22 1.52 31.22 8.02Q31.22 16.78 23.38 19.48Q32.84 23.14 32.84 32.81Q32.84 39.00 29.32 42.97Q25.10 47.79 17.72 47.79Q10.79 47.79 6.68 43.04Q3.66 39.56 3.02 33.44L8.93 33.44Q9.67 42.83 17.72 42.83Q21.45 42.83 23.98 40.72Q27.14 38.01 27.14 32.81Q27.14 21.63 16.10 21.63L12.52 21.63L12.52 17.02ZM54-5.51Q67.99-5.51 67.99 21.14Q67.99 47.79 54 47.79Q40.04 47.79 40.04 21.14Q40.04-5.51 54-5.51M46.97 33.65L59.84 4.30Q57.80-0.55 53.93-0.55Q45.95-0.55 45.95 21.14Q45.95 28.52 46.97 33.65M48.16 37.91Q50.13 42.83 54 42.83Q62.09 42.83 62.09 21.07Q62.09 13.86 61.07 8.66L48.16 37.91Z',
onclick: function () {
var params = {};
var dt = new Date();
params.end = $filter('date')(dt, 'yyyyMMdd');
dt.setDate(dt.getDate() - 29);
params.begin = $filter('date')(dt, 'yyyyMMdd');
loadNewClientAnalysis(params)
}
}
}
},
yAxis: {
type: 'value',
name: '新增商户数'
},
color: colors
},
xAxis: {
basic: {
type: 'category',
boundaryGap: false
},
key: 'create_time'
},
series: [
{
basic: {type: 'line', label: {normal: {show: true}}, showAllSymbols: true},
column: {key: 'new_clients'}
}
]
};
params.org_id = $scope.org.org_id;
$http.get('/dashboard/system/new_clients', {params: params}).then(function (resp) {
$scope.analysis.clients_line = chartParser.parse(analysisConfig, resp.data.reverse());
})
}
$scope.loadPartners(1);
$scope.uploadLogo = function (file) {
if (file == null) {
return;
@ -158,14 +477,14 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
};
$scope.params = {role:'1111111',org_id:$scope.org.org_id};
$scope.pagination = {};
$scope.paginationa = {};
$scope.listManagers = function (page) {
var params = angular.copy($scope.params);
params.page = page || $scope.pagination.page || 1;
params.page = page || $scope.paginationa.page || 1;
$http.get('/sys/manager_accounts',{params:params}).then(function (resp) {
$scope.managers = resp.data.data;
$scope.pagination = resp.data.pagination;
$scope.paginationa = resp.data.pagination;
})
};

263
src/main/ui/static/config/organizations/templates/org_detail.html
Unescape View File

@ -329,6 +329,261 @@
</div>
</form>
</uib-tab>
<uib-tab heading="商户">
<div class="box box-warning" style="border-top-color:#f06101">
<div class="box-body no-padding table-responsive">
<div>
<span style="float: right;font-size: 14px;" class="del_client">禁用</span>
<span style="float: right;font-size: 14px;" class="pass_timeout">&nbsp;&nbsp;超期提醒&nbsp;&nbsp;</span>
<span style="float: right;font-size: 14px;"
class="bg-red">&nbsp;&nbsp;等待合规&nbsp;&nbsp;</span>
<span style="float: right;font-size: 14px;"
class="bg-green">&nbsp;&nbsp;绿色通道&nbsp;&nbsp;</span>
<span style="float: right;font-size: 14px;">&nbsp;&nbsp;通过&nbsp;&nbsp;</span>
</div>
<table class="table table-striped">
<thead>
<tr>
<th style="padding: 12px;">Partner Code</th>
<th style="padding: 12px;">Partner Name</th>
<th style="padding: 12px;">Sub Mch ID</th>
<th style="padding: 12px;">Register Time</th>
<th style="padding: 12px;">Compliance Status</th>
<th style="padding: 12px;">Organization</th>
<th style="padding: 12px;">BD</th>
<th style="padding: 12px;" ng-if="'client_detail_by_moniker'|withFunc">Operation</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="partner in partners"
ng-class="{pass_timeout:partner.pass_timeout,success:partner.source==5,warning:partner.approve_result==5 && ('100'|withRole)}">
<td>
<a class="text-primary" role="button" title="Detail"
ng-click="openClientBoard(partner)"
ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))">
<span ng-bind="partner.client_moniker"></span></a>
<span ng-bind="partner.client_moniker" ng-if="partner.approve_result!=1 && !(partner.approve_result==2 && (partner.source==1 || partner.source==2))"></span>
<span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
<i class="fa fa-sitemap" ng-if="partner.parent_client_id"
title="Sub Partner"></i>
<i class="text-danger fa fa-envelope-o"
ng-if="(partner.approve_result==1 || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))) && (partner.approve_email_send==2 || partner.approve_email_send==0)"
title="Init email send failed"></i>
<i class="text-danger fa fa-clock-o" ng-if="partner.temp_sub_merchant"
title="Using temp Sub Merchant ID"></i>
</td>
<td ng-bind="partner.short_name"></td>
<td ng-bind="partner.sub_merchant_id"></td>
<td ng-bind="partner.create_time"></td>
<td ng-class="{'bg-green':(partner.approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.open_status==1||partner.open_status==2||partner.open_status==4) && partner.approve_result!=3)||(partner.approve_result==3 && (!partner.open_status || partner.open_status==1 || partner.open_status == 4))||(partner.approve_result==4 && !partner.open_status)||(partner.open_status==10)}">
<span ng-if="partner.approve_result==1 && partner.approve_time">通过({{partner.approve_time}})</span>
<span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source!=4">资料完善中</span>
<span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source==4">(自助开通)资料完善中</span>
<span ng-if="!partner.open_status && partner.approve_result==2 && partner.approve_time">自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}})</span>
<span ng-if="partner.approve_result==0 && partner.approve_time">不通过({{partner.approve_time}})</span>
<span ng-if="partner.approve_result==5 && partner.approve_time && partner.refuse_remark">申请打回({{partner.refuse_remark|limitTo:15}})</span>
<span ng-if="(partner.open_status==1||partner.open_status==4) && partner.approve_result!=3"><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
<span ng-if="partner.approve_result==3 && (!partner.open_status || partner.open_status==4)">自助开通（等待合规）</span>
<span ng-if="partner.open_status==2">合同制作完成</span>
<span ng-if="partner.open_status==3 && partner.approve_result!=5">等待BD上传材料审核</span>
<span ng-if="partner.open_status==10">绿色通道申请中</span>
<span ng-if="partner.approve_result==4 && !partner.open_status"><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
</td>
<td ng-bind="partner.org_name"></td>
<td ng-bind="partner.bd_user_name"></td>
<td ng-if="'client_detail_by_moniker'|withFunc">
<a class="text-primary" role="button" title="Detail"
ui-sref="partners.detail({clientMoniker:partner.client_moniker})">
<i class="fa fa-search"></i> Detail
</a>
</td>
</tr>
</tbody>
</table>
</div>
<div class="box-footer" ng-if="partners.length">
<uib-pagination class="pagination"
total-items="pagination.totalCount"
boundary-links="true"
ng-model="pagination.page"
items-per-page="pagination.limit"
max-size="10"
ng-change="loadPartners()"
previous-text="&lsaquo;"
next-text="&rsaquo;"
first-text="&laquo;"
last-text="&raquo;"></uib-pagination>
<div class="row">
<div class="col-xs-12">Total Records:{{pagination.totalCount}};Total
Pages:{{pagination.totalPages}}
</div>
</div>
</div>
</div>
</uib-tab>
<uib-tab heading="交易情况" ng-click="reloadTrade()">
<div class="row">
<div class="col-sm-12">
<div class="box box-warning">
<div class="box-header with-border">商户新增趋势</div>
<div class="box-body">
<div class="chart" echarts="analysis.clients_line" style="height: 300px"
ng-class="{nodata:analysis.clients_line.nodata}"></div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="box box-warning">
<div class="box-header with-border">交易额趋势</div>
<div class="box-body">
<div class="chart" echarts="analysis.trade_line" style="height: 300px"
ng-class="{nodata:analysis.trade_line.nodata}"></div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="box">
<div class="box-header">
<div class="form-horizontal">
<div class="form-group col-xs-12">
<label class="control-label col-xs-4 col-sm-2">Date Range</label>
<div class="col-sm-10">
<div class="form-control-static form-inline">
<div style="display: inline-block">
<input class="form-control" id="date-from-input" ng-model="params.begin"
uib-datepicker-popup size="10" placeholder="From"
is-open="dateBegin.open" ng-click="dateBegin.open=true"
datepicker-options="{maxDate:params.end||today}">
</div>
~
<div style="display: inline-block">
<input class="form-control" id="date-to-input" ng-model="params.end"
uib-datepicker-popup size="10" placeholder="To"
is-open="dateTo.open" ng-click="dateTo.open=true"
datepicker-options="{minDate:params.begin,maxDate:today}">
</div>
<div class="btn-group">
<a role="button" class="btn btn-default btn-sm"
ng-click="chooseToday()">Today</a>
</div>
<div class="btn-group">
<a role="button" class="btn btn-default btn-sm"
ng-click="chooseYesterday()">Yesterday</a>
</div>
<div class="btn-group">
<a role="button" class="btn btn-default btn-sm"
ng-click="chooseLast7Days()">Last 7 Days</a>
</div>
<div class="btn-group">
<a role="button" class="btn btn-default btn-sm" ng-click="thisMonth()">This
Month</a>
</div>
<div class="btn-group">
<a role="button" class="btn btn-default btn-sm" ng-click="lastMonth()">Last
Month</a>
</div>
<div class="btn-group">
<a role="button" class="btn btn-default btn-sm" ng-click="thisYear()">This
Year</a>
</div>
<button class="btn btn-success" type="button" ng-click="loadTransactionAmountInOrg()">
<i class="fa fa-search"></i>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row cen">
<div class="col-sm-12">
<div class="box">
<loadingbar ng-if="future_loading"></loadingbar>
<div class="box-header with-border">交易分布</div>
<div class="box-body" ng-if="orgAmounts.length">
<div class="row">
<div class="col-sm-4 col-xs-12">
<p class="text-center">组织总交易额</p>
<div class="col-sm-12 col -xs-4">
<table class="table table-bordered table-hover table-striped">
<thead>
<tr>
<th>Organization</th>
<th>Amount ($)</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="org in orgAmounts">
<td ng-bind="org.org_name"></td>
<td ng-bind="org.amount"></td>
</tr>
</tbody>
</table>
<loadingbar ng-if="partners_loading"></loadingbar>
</div>
</div>
<div class="col-sm-8 col-xs-12">
<p class="text-center">{{chooseOrg}} 合伙人商户交易量排名</p>
<div class="col-sm-12 col-xs-12">
<table class="table table-bordered table-hover table-striped">
<thead>
<tr>
<th style="width: 10%">Ranking</th>
<th style="width: 30%">Partner</th>
<th>AUD Amount</th>
<th style="width: 10%">Ranking</th>
<th style="width: 30%">Partner</th>
<th>Amount</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="sale in partnerSalesList">
<td style="text-align: center;font-style: italic;font-size: larger"
ng-bind="$index*2+1+'.'"></td>
<td>
<a class="text-primary" role="button" title="Detail"
ui-sref="partners.detail({clientMoniker:sale[0].client_moniker})">
{{sale[0].client_moniker}}
</a>
</td>
<td ng-bind="sale[0].amount"></td>
<td style="text-align: center;font-style: italic;font-size: larger"
ng-bind="$index * 2 + 2 +'.'"></td>
<td>
<a class="text-primary" role="button" title="Detail"
ui-sref="partners.detail({clientMoniker:sale[1].client_moniker})">
{{sale[1].client_moniker}}
</a>
</td>
<td ng-bind="sale[1].amount"></td>
</tr>
</tbody>
</table>
<loadingbar ng-if="rank_loading"></loadingbar>
</div>
</div>
</div>
</div>
<div class="box-footer">
</div>
</div>
</div>
</div>
</uib-tab>
<uib-tab heading="提成">
</uib-tab>
</uib-tabset>
</div>
</div>
@ -419,10 +674,10 @@
</div>
<div class="box-footer" ng-if="managers.length">
<uib-pagination class="pagination"
total-items="pagination.totalCount"
total-items="paginationa.totalCount"
boundary-links="true"
ng-model="pagination.page"
items-per-page="pagination.limit"
ng-model="paginationa.page"
items-per-page="paginationa.limit"
max-size="10"
ng-change="listManagers()"
previous-text="&lsaquo;"
@ -430,7 +685,7 @@
first-text="&laquo;"
last-text="&raquo;"></uib-pagination>
<div class="row">
<div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div>
<div class="col-xs-12">Total Records:{{paginationa.totalCount}};Total Pages:{{paginationa.totalPages}}</div>
</div>
</div>
</div>

3
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -2067,6 +2067,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t1.HFpay);
$scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t1.Rpay);
$scope.rate.yeepay_rate_value = parseFloat($scope.sysRateConfig.t1.Yeepay);
$scope.rate.transaction_fee = 0;
break;
}
case '2': {
@ -2078,6 +2079,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t2.HFpay);
$scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t2.Rpay);
$scope.rate.yeepay_rate_value = parseFloat($scope.sysRateConfig.t2.Yeepay);
$scope.rate.transaction_fee = 0;
break;
}
case '3': {
@ -2089,6 +2091,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.rate.hf_rate_value = parseFloat($scope.sysRateConfig.t3.HFpay);
$scope.rate.Rpay_rate_value = parseFloat($scope.sysRateConfig.t3.Rpay);
$scope.rate.yeepay_rate_value = parseFloat($scope.sysRateConfig.t3.Yeepay);
$scope.rate.transaction_fee = 0;
break;
}
}

Write Preview
Loading…
Cancel
Save