买卖家支付记录调整

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

@@ -393,7 +393,7 @@ public class BankInfoServiceImpl implements BankInfoService {
 
 	@Override
 	public ResultMap getCountByNumber(Integer type, String number) {
-		if (type != Type.MALL.value() && type != Type.BUYER.value() && type != Type.MALL.value()){
+		if (type != Type.MALL.value() && type != Type.BUYER.value() && type != Type.SUP.value()){
 			return new ResultMap(CodeType.ERROR_STATE, "类型不存在，确认要查找账户的类型");
 		}
 		if (StringUtils.isEmpty(number)){

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

@@ -9,15 +9,15 @@ define(['app/app'], function(app) {
 		var hideBankFilter = $filter("hideBankFilter");
 
 		//历史记录的状态
-		var hiStatus= SessionService.get('buyCenter');
+		var hiStatus= SessionService.getCookie("buyCenter");
 
 		$scope.status = hiStatus == null ? 'pay-history' : hiStatus;
 
-		//切换银行账户信息，历史记录的的的状态
+		//切换银行账户信息，历史记录的状态
 		$scope.toggleStatus = function(status) {
 			if($scope.status != status) {
 				$scope.status = status;
-				SessionService.set('buyCenter', status);
+				SessionService.setCookie('buyCenter', status);
 				loadData();
 			}
 		};
@@ -149,6 +149,14 @@ define(['app/app'], function(app) {
 			$scope.bankInfoTableParams.reload();
 		};
 
+		var clearHistoryParams = function () {
+			$scope.keyword = null;
+			$scope.currency = 'ALL';
+			$scope.paytype = 'ALL';
+			$scope.startDate = null;
+			$scope.endDate = null;
+		};
+
 		$scope.filterLoad = function () {
 			loadPayHistory();
 		};
@@ -225,6 +233,7 @@ define(['app/app'], function(app) {
 		var loadData = function() {
 			switch ($scope.status) {
 				case 'pay-info' :
+					clearHistoryParams();
 					loadAccountData();
 					break;
 				case 'pay-history':
@@ -493,6 +502,11 @@ define(['app/app'], function(app) {
 			}
 		};
 
+		$rootScope.$on('$stateChangeStart',function(event,toState,toParams,fromState,fromParams){
+			if(fromState.name == 'pay_center'){
+				SessionService.removeCookie("buyCenter");
+			}
+		});
 	}]);
 
 
@@ -508,13 +522,6 @@ define(['app/app'], function(app) {
 			'兴业银行','中信银行','中国光大银行','广发银行','平安银行','中国邮政储蓄银行','华夏银行','浦发银行'
 		];
 
-		// $scope.bankBlur = function () {
-		// 	console.log(!$scope.account.bankname);
-		// 	if (!$scope.account.bankname){
-		// 		$scope.showBankFrame = true;
-		// 	}
-		// };
-
 		$scope.showList = function () {
 			$scope.showBankFrame = !$scope.showBankFrame;
 			$scope.matchData = true;
@@ -609,7 +616,7 @@ define(['app/app'], function(app) {
 		};
 
 		var validateRepeat = function (number) {
-			bankInfoService.getCountByNumber({type:1062,number:number}, {}, function (data) {
+			bankInfoService.getCountByNumber({type:1061, number:number}, {}, function (data) {
 				if (data.success){
 					if (data.data != 0){
 						$scope.repeatError = true;
@@ -633,8 +640,8 @@ define(['app/app'], function(app) {
 				toaster.pop('error', '请按要求填写正确的信息');
 				return ;
 			}
-			if ($scope.branchError || $scope.branchPattError || $scope.numberError || $scope.numberPattError ||
-				$scope.nameError){
+			if (!$scope.matchData || $scope.branchError || $scope.branchPattError || $scope.numberError || $scope.numberPattError ||
+				$scope.nameError || $scope.repeatError){
 				toaster.pop('error', '请按要求填写正确的信息');
 				return ;
 			}

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

@@ -411,7 +411,7 @@ define([ 'app/app' ], function(app) {
 			transfer.jsonPament = jsonPament;
 			transfer.jsonReceive = jsonReceive;
 			transfer.imgUrl = $scope.imageUrl;
-			transfer.transferTime = $scope.transferTime.getTime();
+			// transfer.transferTime = $scope.transferTime.getTime();
 			transfer.total = $scope.$$bankTransfer.total;
 			bankTransferService.saveTransfer({order: $scope.orderNum.split('，').join('-')}, transfer, function(data) {
 				toaster.pop('success', '信息保存成功');

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

@@ -13,7 +13,7 @@ define(['app/app'], function(app) {
         var enIdFilter = $filter('EncryptionFilter');
 
         //历史记录的状态
-        var hiStatus= SessionService.get('vendorCenter');
+        var hiStatus= SessionService.getCookie('vendorCenter');
 
         $scope.$payCenter = {};
         $scope.param = {};
@@ -114,7 +114,17 @@ define(['app/app'], function(app) {
             $scope.tradeRecordTableParams.reload();
         };
 
+        var clearRecordParams = function () {
+            $scope.keyword = null;
+            $scope.startDate = null;
+            $scope.endDate = null;
+        };
+
         $scope.search = function () {
+            if (!$scope.startDate){
+                toaster.pop("info", "请输入起始日期");
+                return ;
+            }
             loadHistory();
         };
 
@@ -125,6 +135,7 @@ define(['app/app'], function(app) {
                     loadHistory();
                     break;
                 case 'accountTab':
+                    clearRecordParams();
                     loadAccountData();
                     break;
             }
@@ -135,15 +146,20 @@ define(['app/app'], function(app) {
         $scope.setTab = function (tab) {
             if($scope.tab !== tab) {
                 $scope.tab = tab;
-                SessionService.set('vendorCenter', tab);
+                SessionService.setCookie('vendorCenter', tab);
                 loadData();
             }
         };
 
-        $scope.condition = {
-            startDateOpen: false,
-            endDateOpen: false
+        $scope.condition = [];
+        var start = {
+            open : false
+        };
+        var end = {
+            open : false
         };
+        $scope.condition.push(start);
+        $scope.condition.push(end);
 
         // 打开日期选择框
         $scope.openDatePicker = function($event, item, openParam, status) {
@@ -161,34 +177,66 @@ define(['app/app'], function(app) {
             }
             $event.preventDefault();
             $event.stopPropagation();
-            item[openParam] = !item[openParam];
+            openParam == 0 ? $scope.condition[1].open = false : $scope.condition[0].open = false;
+            item[openParam].open = !item[openParam].open;
         };
 
         $scope.onDateCondition = function (bool) {
-            if (!$scope.startDate){
-                $scope.startDate = null;
-                toaster.pop("info", "请输入正确的日期格式");
-                return;
-            }
-            console.log(bool);
-            if (bool){
-                console.log($scope.startDate);
+            var text = '';
+            var datePattern = /^(\d{4})-(\d{2})-(\d{2})$/;
+            if (bool == 1){
+                text = document.getElementById("start").value;
+                if (text != '' && !datePattern.test(text)){
+                    // $scope.startDate = text;
+                    toaster.pop("info", "请输入正确开始时间格式");
+                    return;
+                }
+                if (!validateDate(text)){
+                    // $scope.startDate = text;
+                    toaster.pop("info", "请输入正确开始时间格式");
+                    return;
+                }
+                if (!$scope.startDate && text != ''){
+                    $scope.startDate = convertTextToDate(text);
+                }
+                if ($scope.startDate && !$scope.endDate){
+                    var nowTime = new Date();
+                    $scope.endDate = new Date(nowTime.getFullYear(), nowTime.getMonth(), nowTime.getDate());
+                }
+                if ($scope.endDate && $scope.startDate.getTime() > $scope.endDate.getTime()){
+                    $scope.endDate = new Date($scope.startDate.getTime() + 86400000);
+                }
             }else {
-                console.log($scope.endDate);
-            }
-            // if (bool){
-            //     //验证开始日期格式
-            //     if(!validateDate($scope.startDate)){
-            //         $scope.startDate = null;
-            //         toaster.pop("info", "请输入正确的日期格式");
-            //     }
-            // }else {
-            //     //验证结束日期格式
-            //     if(!validateDate($scope.endDate)){
-            //         $scope.endDate = null;
-            //         toaster.pop("info", "请输入正确的日期格式");
-            //     }
-            // }
+                text = document.getElementById("end").value;
+                if (text != '' && !datePattern.test(text)){
+                    // $scope.endDate = text;
+                    toaster.pop("info", "请输入正确结束时间格式");
+                    return;
+                }
+                if (!validateDate(text)){
+                    // $scope.endDate = text;
+                    toaster.pop("info", "请输入正确结束时间格式");
+                    return;
+                }
+                if (!$scope.endDate && text != ''){
+                    $scope.endDate = convertTextToDate(text);
+                }
+                if ($scope.startDate && $scope.startDate.getTime() > $scope.endDate.getTime()){
+                    $scope.startDate = new Date($scope.endDate.getTime() - 86400000);
+                }
+            }
+        };
+
+        /**
+         * 将文本转化为日期
+         * @param value
+         * @returns {Date}
+         */
+        var convertTextToDate = function (value) {
+            var date = value;
+            var result = date.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/);
+
+            return new Date(result[1], result[3] - 1, result[4]);
         };
 
         /**
@@ -197,12 +245,6 @@ define(['app/app'], function(app) {
          * @returns {boolean}
          */
         var validateDate = function (value) {
-            console.log($scope.startDate);
-            if (value instanceof Date){
-                console.log(value.getFullYear() + "=" + (value.getMonth() + 1) + "=" + value.getDate());
-                return true;
-            }
-            alert(typeof (value));
             var date = value;
             var result = date.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/);
 
@@ -312,7 +354,7 @@ define(['app/app'], function(app) {
         };
 
         var validateRepeat = function (number) {
-            bankInfoService.getCountByNumber({type:1062,number:number}, {}, function (data) {
+            bankInfoService.getCountByNumber({type:1063,number:number}, {}, function (data) {
                 if (data.success){
                     if (data.data != 0){
                         $scope.repeatError = true;
@@ -360,8 +402,8 @@ define(['app/app'], function(app) {
                 toaster.pop('error', '请按要求填写正确的信息');
                 return ;
             }
-            if ($scope.branchError || $scope.branchPattError || $scope.numberError || $scope.numberPattError ||
-                $scope.nameError || $scope.fileError || $scope.fileLegError){
+            if (!$scope.matchData || $scope.branchError || $scope.branchPattError || $scope.numberError || $scope.numberPattError ||
+                $scope.nameError || $scope.repeatError || $scope.fileError || $scope.fileLegError){
                 toaster.pop('error', '请按要求填写正确的信息');
                 return ;
             }
@@ -636,6 +678,12 @@ define(['app/app'], function(app) {
                 });
         };
 
+        $rootScope.$on('$stateChangeStart',function(event,toState,toParams,fromState,fromParams){
+            if(fromState.name == 'pay_center'){
+                SessionService.removeCookie("vendorCenter");
+            }
+        });
+
         //当前页在中间计算方式
         $scope.middleSegment = function (currentPage) {
             angular.forEach($scope.pages, function (page) {

src/main/webapp/resources/view/common/bankInfoModal.html

@@ -106,7 +106,7 @@
 		  		</div>
 				<span class="warn-message" ng-if="account.number && numberPattError">请填写正确的银行账号</span>
 				<span class="warn-message" ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</span>
-				<span class="warn-message" ng-if="account.number && !numberPattError && !numberError" && repeatError>该银行账号已存在</span>
+				<span class="warn-message" ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</span>
 				<span class="warn-message" ng-if="myForm.number.$touched && myForm.number.$invalid">银行账号不能为空</span>
 		  	</div>
 			<div class="form-group">

src/main/webapp/resources/view/vendor/forstore/pay_center.html

@@ -621,28 +621,28 @@
                     <div class="sreach fr">
                         <div class="date fl">
                             <div class="data-input">
-                                <input type="text" ng-model="startDate"
+                                <input id="start" type="text" ng-model="startDate"
                                        class="form-control select-adder" placeholder="起始时间"
                                        datepicker-popup="yyyy-MM-dd"
-                                       is-open="condition.startDateOpen"
+                                       is-open="condition[0].open"
                                        max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
                                        datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                       ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
-                                       ng-change="onDateCondition(true)"/>
-                                <button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>
+                                       ng-click="openDatePicker($event, condition, 0,1)"
+                                       ng-blur="onDateCondition(1)"/>
+                                <button class="open" ng-click="openDatePicker($event, condition, 0)"></button>
                             </div>
 
                             <em>–</em>
                             <div class="data-input">
-                                <input type="text" ng-model="endDate"
+                                <input id="end" type="text" ng-model="endDate"
                                        class="form-control select-adder" placeholder="结束时间"
                                        datepicker-popup="yyyy-MM-dd"
-                                       is-open="condition.endDateOpen"
+                                       is-open="condition[1].open"
                                        min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
                                        datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                       ng-click="openDatePicker($event, condition, 'endDateOpen',2)"
-                                       ng-change="onDateCondition(false)"/>
-                                <button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>
+                                       ng-click="openDatePicker($event, condition, 1, 2)"
+                                       ng-blur="onDateCondition(2)"/>
+                                <button class="open" ng-click="openDatePicker($event, condition, 1)"></button>
                             </div>
                         </div>
                         <div class="sreach-input fr">
@@ -819,13 +819,13 @@
             <div class="row">
                 <div class="col-md-3"><em class="colorRed">*</em>银行账号</div>
                 <div class="col-md-5">
-                    <input name="number" ng-model="account.number" ng-change="checkAccount(3)" class="form-control" autocomplete="off" type="text" placeholder="请填写银行账号" required>
+                    <input name="number" ng-model="account.number" ng-change="checkAccount(3)" class="form-control" autocomplete="off" type="text" placeholder="请填写银行账号">
                 </div>
                 <div class="col-md-4">
                     <p ng-if="account.number && numberPattError">请填写正确的银行账号</p>
                     <p ng-if="account.number && !numberPattError && numberError">请勿超过30个字符</p>
-                    <p ng-if="account.number && !numberPattError && !numberError" && repeatError>该银行账号已存在</p>
-                    <p ng-if="myForm.number.$touched && myForm.number.$invalid">银行账号不能为空</p>
+                    <p ng-if="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
+                    <p ng-if="myForm.number.$touched && !account.number">银行账号不能为空</p>
                 </div>
             </div>
             <div class="row">