处理后台收付款接口

src/main/webapp/resources/js/admin/controllers/checkMoney/creditCardAdminCtrl.js

@@ -1,21 +1,22 @@
 define(['app/app'], function(app) {
 	'use strict';
-	app.register.controller('creditCardAdminCtrl', ['$scope', 'toaster', 'BaseService', 'bankInfoService', '$filter', '$modal', function($scope, toaster, BaseService, bankInfoService, $filter, $modal) {
+	app.register.controller('creditCardAdminCtrl', ['$scope', 'toaster', 'BaseService', 'bankInfoService', '$filter', '$modal', 'ngTableParams', '$upload', function($scope, toaster, BaseService, bankInfoService, $filter, $modal, ngTableParams, $upload) {
 		BaseService.scrollBackToTop();
 		
 		var hideBankFilter = $filter("hideBankFilter");
 		
 		$scope.active = "personal";
+        $scope.param = {};
 		
 		var getState = function() {
-			var method = "getAdminEnterAccount";
+			var method = "getSaleEeterpriseBank";
 			switch($scope.active) {
 				case "personal" :
-					method = "getAdminPersAccount"; break;
+					method = "getBuyPersonalBank"; break;
 				case "enterprise":
-					method = "getAdminEnterAccount"; break;
+					method = "getSaleEeterpriseBank"; break;
 					default :
-						method = "getAdminEnterAccount";
+						method = "getSaleEeterpriseBank";
 			}
 			return method;
 		}
@@ -24,36 +25,55 @@ define(['app/app'], function(app) {
 			var method = null;
 			switch(kind) {
 			case "personal":
-				method = "saveAdminPerAccount"; break;
+				method = "saveBuyPersonalBank"; break;
 			case "enterprise": 
-				method = "saveAdminEnteAccount"; break;
+				method = "saveBuyEnterpriseBank"; break;
 			}
 			return method;
 		}
 		
 		$scope.setActive = function(status) {
 			$scope.active = status;
-			loadAccount();
+            loadAccountData();
 		}
 		
 		$scope.kind = 0;
-		
-		var loadAccount = function() {
-			bankInfoService[getState()]({}, function(data) {
-				$scope.accounts = data;
-				angular.forEach($scope.accounts, function(account) {
-					account.filterAccount = hideBankFilter(account.number);
-				})
-			}, function(response) {
-				toaster.pop('error', '获取账户信息失败 '+ response.data);
-			})
-		}
-		loadAccount();
-		
+
+        $scope.bankInfoTableParams = new ngTableParams({
+            page : 1,
+            count : 10,
+            sorting : {
+                num : 'ASC'
+            }
+        },{
+            total : 0,
+            getData : function ($defer, params) {
+                var param = BaseService.parseParams(params.url());
+                bankInfoService[getState()](param, {}, function(data) {
+                    $scope.accounts = data.content;
+                    angular.forEach($scope.accounts.content, function(account) {
+                        account.filterAccount = hideBankFilter(account.number);
+                    })
+
+                    $scope.totalElements = data.totalElements;
+                    params.total(data.totalElements);
+                    $defer.resolve(data.content);
+                }, function(response) {
+                    toaster.pop('error', '获取账户信息失败 '+ response.data);
+                })
+			}
+        });
+
+        var loadAccountData = function() {
+            $scope.bankInfoTableParams.page(1);
+            $scope.bankInfoTableParams.reload();
+        };
+        loadAccountData();
+
 		$scope.setDefaultAccount = function(id) {
 			bankInfoService.setDefaultAccount({id : id}, function() {
 				toaster.pop('success', '设置成功');
-				loadAccount();
+                loadAccountData();
 			}, function(response) {
 				toaster.pop('error', '设置默认账户失败');
 			})
@@ -65,7 +85,7 @@ define(['app/app'], function(app) {
 			if(isSure){
 				bankInfoService.deleteBank({id: buyAccount.id}, function(data) {
 					toaster.pop('success', '删除成功');
-					loadAccount();
+                    loadAccountData();
 				}, function(response) {
 					toaster.pop('error', '删除失败');
 				})
@@ -94,13 +114,33 @@ define(['app/app'], function(app) {
 					toaster.pop("info", "没有设置对应的账户类型，不能保存");
 					return ;
 				}
-				bankInfoService[method].call(null, account, function(data) {
-					toaster.pop('success', '保存成功','信息已更新');
-					$scope.kind = account.kind;
-					loadAccount();
-				}, function(res) {
-					toaster.pop('error', '错误', res.data);
-				});
+				account.accountType = $scope.active === 'personal' ? 'PAY_TYPE' : 'RECEIVE_TYPE';
+                if($scope.active === 'personal') {
+                    bankInfoService[method].call(null, account, function(data) {
+                        toaster.pop('success', '保存成功','信息已更新');
+                        $scope.kind = account.kind;
+                        loadAccountData();
+                    }, function(res) {
+                        toaster.pop('error', '错误', res.data);
+                    });
+				} else {
+                    $upload.upload({
+                        url : 'trade/bankInfo/save/enterprise',
+                        method: 'POST',
+                        params : {type : 'sup'},
+                        data: {
+                            bankInfo: account
+                        }
+                    }).success(function(data){
+                        if(data){
+                            account = {};
+                            toaster.pop('success', '保存成功');
+                            loadAccountData();
+                        }
+                    }).error(function(err){
+                        toaster.pop('error', err || "保存账户信息失败");
+                    });
+				}
 			});
 		};
 		

src/main/webapp/resources/js/common/query/bankInfo.js

@@ -99,7 +99,7 @@ define(['ngResource'], function(ngResource) {
 			// saveBuyEnterpriseBank : {
 			// 	url : 'trade/bankInfo/save/enterprise',
 			// 	method : 'POST',
-			// 	params : {type : 'buyer'}
+			// 	params : {type : 'sup'}
 			// },
 
 			//保存商城的企业账户

src/main/webapp/resources/js/usercenter/controllers/forstore/pay_center_ctrl.js

@@ -824,6 +824,7 @@ define(['app/app'], function(app) {
             }
 
             var method = 'saveBuyPersonalBank'; //不区分个人和企业账户
+			$scope.account.accountType = 'PAY_TYPE';
             bankInfoService[method].call(null, null, $scope.account, function(data) {
                 if (data) {
                     $scope.showAddFrame = false;

src/main/webapp/resources/view/admin/checkMoney/creditCardAdmin.html

@@ -53,19 +53,19 @@ div[role="button"]:HOVER {
 		<div class="fullscreen" style="padding: 10px;">
 			<div class="row">
 				<div class="col-sm-1">
-					共<span class="badge">{{accounts.length}} </span>条
+					共<span class="badge">{{totalElements}} </span>条
 				</div>
 				<div class="col-sm-9">
-					<button type="button" class="btn btn-default btn-group-left" ng-class="{'btn-primary':active=='personal'}" ng-click="setActive('personal')">个人账户</button>
-					<button type="button" class="btn btn-default btn-group-rigth" ng-class="{'btn-primary':active=='enterprise'}" ng-click="setActive('enterprise')">企业账号</button>
+					<button type="button" class="btn btn-default btn-group-left" ng-class="{'btn-primary':active=='personal'}" ng-click="setActive('personal')">付款账户</button>
+					<button type="button" class="btn btn-default btn-group-rigth" ng-class="{'btn-primary':active=='enterprise'}" ng-click="setActive('enterprise')">收款账号</button>
 				</div>
-				<div class="col-sm-2">
+				<div class="col-sm-2" ng-if="totalElements < 20">
 					<div class="add-count">
 						<a ng-click="editAccount()" style="font-size: 14px;"><i class="fa fa-plus-square"></i>&nbsp;新增银行账户</a>
 					</div>
 				</div>
 			</div>
-			<table class="table table-bordered table-striped text-center" style="margin-top: 10px;">
+			<table ng-table="bankInfoTableParams" class="table table-bordered table-striped text-center" style="margin-top: 10px;">
 				<thead  class="text-center">
 				    <tr>
 						<th width="240px">开户人</th>
@@ -86,7 +86,7 @@ div[role="button"]:HOVER {
 				        </td>
 				    </tr>
 			    </tbody>
-			</table>			
+			</table>
 		</div>
 		<!-- ng-tableEnd -->
 	</div>