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

[fix]商户号管理页面优化

Browse Source
master
hellolujian 6 years ago
parent 1ee911e4c2
commit 51402da218
3 changed files with 95 additions and 37 deletions
Show Stats Download Patch File Download Diff File

9
src/main/java/au/com/royalpay/payment/manage/merchantid/core/impl/MerchantIdManageServiceImpl.java
Unescape View File

@ -62,8 +62,8 @@ public class MerchantIdManageServiceImpl implements MerchantIdManageService {
@Override
public Map<String, List<JSONObject>> listSubMerchantId(JSONObject manager) {
List<JSONObject> clients = clientMapper.listSubMerchantId();
return getClientMap(clients);
List<JSONObject> clients = clientMapper.listSubMerchantId();
return getClientMap(clients);
}
@Override
public JSONObject listNotTradeSubMerchantId(JSONObject manager) {
@ -139,7 +139,10 @@ public class MerchantIdManageServiceImpl implements MerchantIdManageService {
client.put("temp_sub_merchant", true);
}
}
Map<String, List<JSONObject>> clientsMap = clients.stream().filter(t->t.containsKey("merchant_id")).filter(t->t.containsKey("sub_merchant_id")).collect(Collectors.groupingBy(t->t.getString("merchant_id")));
Map<String, List<JSONObject>> clientsMap = clients.stream()
.filter(t->t.containsKey("merchant_id"))
.filter(t->t.containsKey("sub_merchant_id"))
.collect(Collectors.groupingBy(t->t.getString("merchant_id")));
return clientsMap;
}

47
src/main/ui/static/payment/merchantid/merchant_id_manager.js
Unescape View File

@ -17,19 +17,49 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
})
}]);
app.controller('merchantIdManageCtrl', ['$scope', '$state', '$http', function ($scope, $state, $http) {
$scope.isCollapsed = true;
$scope.toShow = false;
$scope.client_loading = true;
$scope.isCollapsed = true;
$scope.toShow = false;
$scope.client_loading = true;
$scope.loadClient = function () {
$scope.endIndexMap = {};
const initEndIndex = 60;
$scope.loadClient = function () {
$http.get('/sys/merchant_id').then(function (resp) {
$scope.clientsMap = resp.data;
$scope.client_loading = false;
$scope.clientsMap = resp.data;
$scope.client_loading = false;
// 加入对应项的end索引值
for (var k in $scope.clientsMap) {
if ($scope.clientsMap[k].length <= initEndIndex) {
$scope.endIndexMap[k] = length;
}
else
$scope.endIndexMap[k] = initEndIndex;
}
});
};
$scope.loadClient();
$scope.loadClient();
$scope.more = function(key) {
var endIndex = $scope.endIndexMap[key] + initEndIndex;
// 判断加60后的索引是否超出数组长度
if (endIndex > $scope.clientsMap[key].length) {
$scope.endIndexMap[key] = $scope.clientsMap[key].length;
//alert("$scope.clientsMap[k].length:" + $scope.clientsMap[key].length + "$scope.endIndexMap[k]:" + $scope.endIndexMap[key])
}
$scope.showClient = function (sub_merchant_id) {
else
$scope.endIndexMap[key] = endIndex;
};
$scope.packup = function(key) {
$scope.endIndexMap[key] = initEndIndex;
};
$scope.showClient = function (sub_merchant_id) {
if($scope.sub_merchant_id == sub_merchant_id){
return;
}
@ -38,6 +68,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
$scope.sub_merchant_id = sub_merchant_id;
});
};
}]);
app.controller('noTradeSubMerchantIdCtrl', ['$scope', '$state', '$http','$uibModal', function ($scope, $state, $http,$uibModal) {
$scope.pagination = {};

76
src/main/ui/static/payment/merchantid/templates/merchant_id_manage.html
Unescape View File

@ -78,44 +78,53 @@
<loadingbar ng-if="client_loading"></loadingbar>
<div class="col-sm-12 col-xs-12">
<div style="margin-top: 5px">
<div class="list-group col-sm-12 col-xs-12" ng-repeat="(key,clients) in clientsMap">
<div class="list-group col-sm-12 col-xs-12"
ng-repeat="(key, clients) in clientsMap">
<a class="list-group-item active col-sm-12 col-xs-12">
{{key|choose_merchant_id}}
<!--为了页面的优化，注释此段代码，其下亦是如此
<span ng-show="clients.length>59" class="small-box-footer cursor pull-right"
ng-click="isCollapsed = !isCollapsed"><span
ng-if="clients.length>59">更多 <i class="fa fa-arrow-circle-right"
ng-class="{'i-rotate_90':!isCollapsed}"></i></span></span>
-->
</a>
<a class="list-group-item col-sm-2 col-xs-6 cursor"
ng-repeat="client in clients | orderBy:'client_count':true"
ng-click="showClient(client.sub_merchant_id);toShow=!toShow" ng-if="$index<60">
<span>
{{client.sub_merchant_id}}&nbsp;<i class="fa fa-clock-o text-danger"
title="Using temp Sub Merchant ID"
ng-if="client.temp_sub_merchant"></i></span>
ng-repeat="client in clients.slice(0, endIndexMap[key]) | orderBy:'client_count':true"
ng-click="showClient(client.sub_merchant_id); toShow = !toShow">
<span>
{{client.sub_merchant_id}}&nbsp;
<i class="fa fa-clock-o text-danger"
title="Using temp Sub Merchant ID"
ng-if="client.temp_sub_merchant">
</i>
</span>
<span class="badge pull-right position_re">
{{client.client_count}}
<div ng-if="sub_merchant_id==client.sub_merchant_id&&toShow" class="popover fade in position_ab"
{{client.client_count}}
<div ng-if="sub_merchant_id==client.sub_merchant_id&&toShow"
class="popover fade in position_ab"
role="tooltip" style="display: block;">
<div class="arrow"></div>
<h3 class="popover-title popover-color">Clients</h3>
<div class="popover-content" style="width: 250px">
<button type="button" class="btn btn-link"
ng-repeat="client_moniker in client_monikers"
ng-show="$index<client_monikers.length-1"
ui-sref="partners.detail({clientMoniker:client_moniker.client_moniker})">
{{client_moniker.client_moniker}}<span class="text-black">,</span>&nbsp;
</button>
<button type="button" class="btn btn-link"
ng-repeat="client_moniker in client_monikers" ng-if="$last"
ui-sref="partners.detail({clientMoniker:client_moniker.client_moniker})">
{{client_moniker.client_moniker}}
</button>
<div class="arrow"></div>
<h3 class="popover-title popover-color">Clients</h3>
<div class="popover-content" style="width: 250px">
<button type="button" class="btn btn-link"
ng-repeat="client_moniker in client_monikers"
ng-show="$index<client_monikers.length-1"
ui-sref="partners.detail({clientMoniker:client_moniker.client_moniker})">
{{client_moniker.client_moniker}}
<span class="text-black">,</span>&nbsp;
</button>
<button type="button" class="btn btn-link"
ng-repeat="client_moniker in client_monikers" ng-if="$last"
ui-sref="partners.detail({clientMoniker:client_moniker.client_moniker})">
{{client_moniker.client_moniker}}
</button>
</div>
</div>
</div>
</span>
</a>
<!--
<a class="list-group-item col-sm-2 col-xs-6 cursor" ng-hide="isCollapsed"
ng-repeat="client in clients | orderBy:'client_count':true"
ng-click="showClient(client.sub_merchant_id);toShow=!toShow" ng-if="$index>59">
@ -124,7 +133,7 @@
title="Using temp Sub Merchant ID"
ng-if="client.temp_sub_merchant"></i></span>
<span class="badge pull-right position_re" aria-hidden="true" title="show detail">
{{client.client_count}}
{{client.client_count}}</span>
<div ng-if="sub_merchant_id==client.sub_merchant_id&&toShow" class="popover fade in position_ab"
role="tooltip" style="display: block;">
<div class="arrow"></div>
@ -145,6 +154,21 @@
</div>
</span>
</a>
-->
<a ng-if="clients.length > 60"
class="list-group-item col-sm-12 col-xs-12 text-center" >
<span class="small-box-footer cursor"
ng-click="more(key)"
ng-if="endIndexMap[key] < clients.length">
更多 <i class="fa fa-arrow-circle-down"></i>
</span>
<span class="small-box-footer cursor pull-right"
ng-click="packup(key)"
ng-if="endIndexMap[key] > 60">
收起 <i class="fa fa-arrow-circle-up"></i>
</span>
</a>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save