Merge remote-tracking branch 'origin/feature/yc-payCenter-1031' into feature/wangcz-payCenter-1031

src/main/java/com/uas/platform/b2c/fa/payment/dao/BankInfoDao.java

@@ -45,7 +45,7 @@ public interface BankInfoDao extends CrudRepository<BankInfo, Long>, JpaSpecific
 	 * @return list
 	 */
 	@Query(value = "select b from BankInfo b where b.enuu =:enuu and b.opraterUserType=:opraterUserType order by num")
-	List<BankInfo> findByEnuuAndTypeAndOpraterUserTypeOrderByNumAsc(@Param("enuu") Long enuu, @Param("opraterUserType") Integer opraterUserType);
+	List<BankInfo> findByEnuuAndOpraterUserTypeOrderByNumAsc(@Param("enuu") Long enuu, @Param("opraterUserType") Integer opraterUserType);
 
 	/**
 	 * 根据下面参数获取企业账户信息
@@ -103,6 +103,16 @@ public interface BankInfoDao extends CrudRepository<BankInfo, Long>, JpaSpecific
 	@Query("select count(b) from BankInfo b where b.enuu=:enuu and b.opraterUserType=:operateUserType and b.status in :status")
 	int getCountByEnuuAndStatus(@Param("enuu") Long enuu, @Param("operateUserType") Integer operateUserType, @Param("status") List<Integer> status);
 
+	/**
+	 * 获取平台的账户数
+	 *
+	 * @param enuu 企业enuu
+	 * @param operateUserType 操作人的类型
+	 * @return
+	 */
+	@Query("select count(b) from BankInfo b where b.enuu=:enuu and b.opraterUserType=:operateUserType and b.status=:status")
+	int getMallCountByEnuuAndStatus(@Param("enuu") Long enuu, @Param("operateUserType") Integer operateUserType, @Param("status") Integer status);
+
 	/**
 	 * 根据银行账号查询个人账号下的账户个数
 	 * @param useruu
@@ -139,4 +149,5 @@ public interface BankInfoDao extends CrudRepository<BankInfo, Long>, JpaSpecific
 	int getEnterpriseCountByNumberAndEnuu(@Param("enuu") Long enuu, @Param("opraterUserType") Integer opraterUserType,
 									 @Param("status") List<Integer> status, @Param("number") String number);
 
+	List<BankInfo> findByUseruuAndEnuuAndNumAndOpraterUserTypeAndStatus(Long useruu, Long enuu, Integer num, Integer opraterUserType, Integer status);
 }

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

@@ -227,27 +227,14 @@ public class BankInfoServiceImpl implements BankInfoService {
 	@Override
 	@Transactional
 	public BankInfo saveB2cAccount(BankInfo bankInfo, Integer operatorType, boolean isPersonal) {
-//		int size = 0;
-//		bankInfo.setOpraterUserType(Type.MALL.value());
-//		bankInfo.setEnuu(sysConf.getEnUU());
-//		bankInfo.setCreateTime(new Date());
-//		if(isPersonal) {
-//			bankInfo.setUseruu(sysConf.getAdminUU());
-//			bankInfo.setType((short)1);
-//		}else {
-//			bankInfo.setType((short)2);
-//		}
-//		if(bankInfo.getType() == 2) {
-//			size = bankInfoDao.getKindCountByEnuuAndStatus(bankInfo.getEnuu(), (short)2, Type.MALL.value(), Status.ALLOW.value());
-//		}else if(bankInfo.getType() == 1) {
-//			size = bankInfoDao.getKindCountByUseruuAndStatus(bankInfo.getUseruu(), bankInfo.getEnuu(), (short)1, Type.MALL.value(), Status.ALLOW.value());
-//		}else {
-//			new IllegalOperatorException("没有给账户设置对应的类型");
-//		}
-//		bankInfo.setNum(++size);
-//		bankInfo.setStatus(Status.ALLOW.value());
-//		return bankInfoDao.save(bankInfo);
-		return null;
+		int size = 0;
+		bankInfo.setOpraterUserType(Type.MALL.value());
+		bankInfo.setEnuu(sysConf.getEnUU());
+		bankInfo.setCreateTime(new Date());
+		size = bankInfoDao.getMallCountByEnuuAndStatus(bankInfo.getEnuu(),Type.MALL.value(), Status.ALLOW.value());
+		bankInfo.setNum(++size);
+		bankInfo.setStatus(Status.ALLOW.value());
+		return bankInfoDao.save(bankInfo);
 	}
 
 	@Override
@@ -306,8 +293,7 @@ public class BankInfoServiceImpl implements BankInfoService {
 		}else {
 			enuu = params[0];
 		}
-//		return bankInfoDao.findByEnuuAndTypeAndOpraterUserTypeOrderByNumAsc(enuu, (short)2, operatorUserType);
-		return null;
+		return bankInfoDao.findByEnuuAndOpraterUserTypeOrderByNumAsc(enuu, operatorUserType);
 	}
 
 	/**
@@ -393,7 +379,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/java/com/uas/platform/b2c/fa/payment/service/impl/BankTransferServiceImpl.java

@@ -436,10 +436,10 @@ public class BankTransferServiceImpl implements BankTransferService {
 		if (StringUtils.hasText(orderId)) {
 			Order order = orderDao.findByOrderid(orderId);
 			if (order != null && order.getBuyerenuu() != null) {
-//				List<BankInfo> bankInfos = bankInfoDao.findByUseruuAndEnuuAndNumAndTypeAndOpraterUserTypeAndStatus(order.getBuyeruu(), order.getBuyerenuu(), 1, (short) 2, Type.BUYER.value(), Status.ALLOW.value());
-//				if (!CollectionUtils.isEmpty(bankInfos)) {
-//					return bankInfos.get(0);
-//				}
+				List<BankInfo> bankInfos = bankInfoDao.findByUseruuAndEnuuAndNumAndOpraterUserTypeAndStatus(order.getBuyeruu(), order.getBuyerenuu(), 1, Type.BUYER.value(), Status.ALLOW.value());
+				if (!CollectionUtils.isEmpty(bankInfos)) {
+					return bankInfos.get(0);
+				}
 			}
 		}
 		return null;
@@ -462,6 +462,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 			info.filter("operateType", type);
 			info.filter("collectenuu", SystemSession.getUser().getEnterprise().getUu());
 		}
+		info.expression(PredicateUtils.isNotNull("transferTime"));
 		filterPageInfo(info, keyword, fromDate, toDate);
 
 		Page<BankTransfer> pageBankTran = bankTransferDao.findAll(new Specification<BankTransfer>() {
@@ -496,6 +497,7 @@ public class BankTransferServiceImpl implements BankTransferService {
 			info.filter("operateType", type);
 			info.filter("collectenuu", SystemSession.getUser().getEnterprise().getUu());
 		}
+		info.expression(PredicateUtils.isNotNull("transferTime"));
 		info.sorting(Sort.Direction.DESC, "transferTime");
 		filterPageInfo(info, keyword, fromDate, toDate);
 		List<BankTransfer> list = bankTransferDao.findAll(new Specification<BankTransfer>() {

src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/SettlementServiceImpl.java

@@ -493,7 +493,7 @@ public class SettlementServiceImpl implements SettlementService {
 			transfer.setJsonPament(bankTransfer.getJsonPament());
 			transfer.setJsonReceive(bankTransfer.getJsonReceive());
 			transfer.setTranferCreateTime(new Date());
-			transfer.setTransferTime(bankTransfer.getTransferTime());
+			transfer.setTransferTime(new Date());
 			bankTransferList.add(transfer);
 
 			//转账和订单的关联信息

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();
 			}
 		};
@@ -120,10 +120,15 @@ define(['app/app'], function(app) {
 			}
 		});
 
-		$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) {
@@ -141,7 +146,81 @@ 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) {
+			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 (text != '' && !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 {
+				text = document.getElementById("end").value;
+				if (text != '' && !datePattern.test(text)){
+					// $scope.endDate = text;
+					toaster.pop("info", "请输入正确结束时间格式");
+					return;
+				}
+				if (text != '' && !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]);
+		};
+
+		/**
+		 * 验证日期格式是否正确
+		 * @param value
+		 * @returns {boolean}
+		 */
+		var validateDate = function (value) {
+			var date = value;
+			var result = date.match(/^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/);
+
+			if (result == null)
+				return false;
+			var d = new Date(result[1], result[3] - 1, result[4]);
+			return (d.getFullYear() == result[1] && (d.getMonth() + 1) == result[3] && d.getDate() == result[4]);
 		};
 
 		var loadAccountData = function() {
@@ -149,6 +228,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 +312,7 @@ define(['app/app'], function(app) {
 		var loadData = function() {
 			switch ($scope.status) {
 				case 'pay-info' :
+					clearHistoryParams();
 					loadAccountData();
 					break;
 				case 'pay-history':
@@ -235,6 +323,14 @@ define(['app/app'], function(app) {
 		loadData();
 
 		$scope.search = function () {
+			if (!$scope.startDate && $scope.endDate){
+				toaster.pop("info", "请输入起始日期");
+				return ;
+			}
+			if ($scope.startDate && !$scope.endDate){
+				toaster.pop("info", "请输入结束日期");
+				return ;
+			}
 			loadPayHistory();
 		};
 
@@ -493,6 +589,11 @@ define(['app/app'], function(app) {
 			}
 		};
 
+		$rootScope.$on('$stateChangeStart',function(event,toState,toParams,fromState,fromParams){
+			if(fromState.name == 'pay_center' || toState.name == 'pay_center'){
+				SessionService.removeCookie("buyCenter");
+			}
+		});
 	}]);
 
 
@@ -508,13 +609,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 +703,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 +727,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,21 @@ 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 && $scope.endDate){
+                toaster.pop("info", "请输入起始日期");
+                return ;
+            }
+            if ($scope.startDate && !$scope.endDate){
+                toaster.pop("info", "请输入结束日期");
+                return ;
+            }
             loadHistory();
         };
 
@@ -125,6 +139,7 @@ define(['app/app'], function(app) {
                     loadHistory();
                     break;
                 case 'accountTab':
+                    clearRecordParams();
                     loadAccountData();
                     break;
             }
@@ -135,15 +150,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 +181,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 (text != '' && !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 (text != '' && !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 +249,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 +358,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 +406,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 ;
             }
@@ -588,7 +634,8 @@ define(['app/app'], function(app) {
                 return ;
             }
             $scope.param.page = page;
-            getData();
+            $scope.tradeRecordTableParams.page($scope.param.page);
+            $scope.tradeRecordTableParams.reload();
         };
 
         //当前页在前段的计算方式
@@ -636,6 +683,12 @@ define(['app/app'], function(app) {
                 });
         };
 
+        $rootScope.$on('$stateChangeStart',function(event,toState,toParams,fromState,fromParams){
+            if(fromState.name == 'pay_center' || toState.name == 'pay_center'){
+                SessionService.removeCookie("vendorCenter");
+            }
+        });
+
         //当前页在中间计算方式
         $scope.middleSegment = function (currentPage) {
             angular.forEach($scope.pages, function (page) {

src/main/webapp/resources/view/admin/modal/creditCard_modal.html

@@ -69,6 +69,17 @@
 					<span ng-show="myForm.bank.$valid" class="text-success help-inline">正确</span>
 				</div>
 			</div>
+			<div class="row">
+				<label class="col-md-2"><strong class="text-inverse">* </strong>开户支行</label>
+				<div class="col-md-7">
+					<input ng-required="true" ng-model="creditCard.branchname" type="text" class="form-control" name="branch"
+						   placeholder="输入开户银行">
+				</div>
+				<div class="col-md-3">
+					<span ng-show="myForm.bank.$touched&&myForm.branch.$invalid" class="text-inverse help-inline">输入开户银行</span>
+					<span ng-show="myForm.bank.$valid" class="text-success help-inline">正确</span>
+				</div>
+			</div>
 			<div class="row">
 				<label class="col-md-2"><strong class="text-inverse">* </strong>银行账号</label>
 				<div class="col-md-7">

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/usercenter/forstore/pay_center.html

@@ -453,28 +453,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"
-									   max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
+									   is-open="condition[0].open"
+									   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"
-									   min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
+									   is-open="condition[1].open"
+									   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-change="onDateCondition(2)"/>
+								<button class="open" ng-click="openDatePicker($event, condition, 1)"></button>
 							</div>
 						</div>
 						<div class="sreach-input fr">

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

@@ -623,28 +623,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"
-                                       max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
+                                       is-open="condition[0].open"
+                                       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"
-                                       min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
+                                       is-open="condition[1].open"
+                                       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">
@@ -826,7 +826,7 @@
                 <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="account.number && !numberPattError && !numberError && repeatError">该银行账号已存在</p>
                     <p ng-if="myForm.number.$touched && !account.number">银行账号不能为空</p>
                 </div>
             </div>