1、修改

src/main/java/com/uas/platform/b2c/fa/payment/controller/BankInfoController.java

@@ -89,7 +89,7 @@ public class BankInfoController {
 	}
 
 	/**
-	 * 分页获取卖家账户信息，已修改
+	 * 分页获取卖家收款账户信息，已修改
 	 * 获取供应商审核通过的信息
 	 * 2016年3月15日 下午5:16:00
 	 *

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/BankInfoServiceImpl.java

@@ -167,6 +167,8 @@ public class BankInfoServiceImpl implements BankInfoService {
 		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("opraterUserType", operatorUserType);
 		pageInfo.filter("enuu", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("dissociative", Type.ENTERPRISING.value());
+		pageInfo.filter("accountType", AccountType.RECEIVE_TYPE);
 		SimpleExpression expression1 = new SimpleExpression("status", Status.SUBMITTED.value(), CriterionExpression.Operator.EQ);
 		SimpleExpression expression2 = new SimpleExpression("status", Status.NOTALLOW.value(), CriterionExpression.Operator.EQ);
 		SimpleExpression expression3 = new SimpleExpression("status", Status.ALLOW.value(), CriterionExpression.Operator.EQ);

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -69,8 +69,8 @@ define([ 'app/app' ], function(app) {
 	}]);
 
 	// 身份认证
-	app.controller('AuthenticationCtrl', ['$scope', '$window', 'AuthenticationService', '$rootScope', 'SessionService', 'collectionService', '$modal', 'toaster','$q', 'Cart',
-		function($scope, $window, AuthenticationService, $rootScope, SessionService, collectionService, $modal, toaster, $q, Cart) {
+	app.controller('AuthenticationCtrl', ['$scope', '$window', 'AuthenticationService', '$rootScope', 'SessionService', 'collectionService', '$modal', 'toaster','$q', 'Cart', '$http',
+		function($scope, $window, AuthenticationService, $rootScope, SessionService, collectionService, $modal, toaster, $q, Cart, $http) {
 			$scope.user = {
 				j_username : "",
 				j_password : "",
@@ -120,10 +120,34 @@ define([ 'app/app' ], function(app) {
                     location.href = './';
 				});
 			};
-
+      var Ajax={
+        get: function(url, fn) {
+          // XMLHttpRequest对象用于在后台与服务器交换数据
+          var xhr = new XMLHttpRequest();
+          xhr.open('GET', url, false);
+          xhr.onreadystatechange = function() {
+            // readyState == 4说明请求已完成
+            if (xhr.readyState == 4 && xhr.status == 200 || xhr.status == 304) {
+              // 从服务器获得数据
+              fn.call(this, xhr.responseText);
+            }
+          };
+          xhr.send();
+        }
+      }
 			// 是否已经登录
 			$scope.isAuthed = AuthenticationService.isAuthed();
 			$scope.userInfo = {};
+      Ajax.get('/user/authentication',function(data) {
+        $scope.userInfo = data
+			})
+			// $http({
+			// 	method: 'get',
+			// 	url: '/user/authentication',
+       //  dataType: 'json',
+			// }).success(function(data) {
+       //  $scope.userInfo = data
+			// })
 
 			// 获取已登录的用户信息
 			var getAuthentication = function() {

src/main/webapp/resources/js/sso/controllers/ssoAddressCtrl.js

@@ -63,7 +63,7 @@ define(['app/app'], function (app) {
                     getData : function ($defer, params) {
                         var param = BaseService.parseParams(params.url());
                         param.isSend = false;
-                        ShippingAddress.getEnterprise(param, {}, function (page) {
+                        ShippingAddress.getShipEnterprise(param, {}, function (page) {
                             $scope.isBiggerFive = false;
                             $scope.total = page.totalElements;
                             params.total(page.totalElements);

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

@@ -896,10 +896,11 @@ define(['app/app'], function(app) {
 					if (addr) {
 						$scope.sendAddress[index] = address;
 					}else {
-						$scope.sendAddress.push(address);
+            $scope.loadShippingAddress();
+						// $scope.sendAddress.push(address);
 					}
 				}
-				$scope.selectAdd(address);
+				// $scope.selectAdd(address);
 			}, function(){
 				toaster.pop('info', '提示 ' + '您已取消收货地址的编辑');
 			});
@@ -1100,7 +1101,7 @@ define(['app/app'], function(app) {
 			address.area = strAres;
 
 			// send属性 控制本地址是否是发货地址
-			ShippingAddress.save({isSetTop: $scope.isSetTop, send: false, isPersonal: true}, address, function(data){
+			ShippingAddress.save({isSetTop: $scope.isSetTop, send: false, isPersonal: false}, address, function(data){
 				toaster.pop('success', '成功 ', '保存收货地址成功');
 				data.isSetTop = $scope.isSetTop;
 				$modalInstance.close(data);

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

@@ -808,7 +808,7 @@ define(['app/app'], function(app) {
 
         $scope.confirm = function() {
             var account = $scope.account;
-
+          account.accountType = 'PAY_TYPE'
             if (!account){
                 toaster.pop('error', '请按要求填写正确的信息');
                 return ;

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

@@ -19,6 +19,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           $rootScope.ShaRETimer = {}
 
           var clearSeekStatus = function () {
+            // if ($scope.seekListData) {}
             angular.forEach($scope.seekListData.content, function (item) {
               item.$status = 0;
             })

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

@@ -471,7 +471,7 @@ define(['app/app'], function(app) {
 
         $scope.ensureAddAccount = function () {
             var account = $scope.account;
-
+          account.accountType = 'RECEIVE_TYPE'
             if (!account){
                 toaster.pop('error', '请按要求填写正确的信息');
                 return ;