Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/core/utils/RegexConstant.java

@@ -38,7 +38,7 @@ public class RegexConstant {
     /**
      * 判断是否只包含数字，英文，英文特殊字符
      */
-    public static final String LetterAndDigitAndEnglishSpecialCharacter = "^[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~@#￥%……&*——+|_\\-A-Za-z0-9]+$";
+    public static final String LetterAndDigitAndEnglishSpecialCharacter = "^[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~@#￥%……&*——+|_\\- A-Za-z0-9]+$";
 
     /**
      * 验证字符串是否为数字

src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -523,7 +523,7 @@ public class ReleaseProductByBatch implements Serializable {
 
 	public void setCodeByExcel(Object value) {
 		if (!StringUtils.isEmpty(value)) {
-			String code = value.toString();
+			String code = value.toString().trim();
 			Matcher matcher = codePattern.matcher(code);
 			if (!matcher.find()) {
 				addErrmsg(ErrorInfoConstant.CODE_PATTERN_INFO.getInfo());

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -539,7 +539,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
                 if (StringUtils.isEmpty(endDate)) {
                     endDate = batch.getDeadline();
                 } else {
-                    if (endDate.compareTo(batch.getDeadline()) == 1) {
+                    if (endDate.compareTo(batch.getDeadline()) != 1) {
                         endDate = batch.getDeadline();
                     }
                 }

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

@@ -1755,19 +1755,28 @@ define([ 'app/app' ], function(app) {
 	/**
 	 * 左侧导航栏控制器
 	 */
-	app.controller('leftNavCtrl', ["$scope", "toaster", '$modal', '$rootScope', function($scope, toaster, $modal, $rootScope) {
-        //安全设置提醒框
-        $scope.openHomeCenterModel = function () {
-            var modalInstance = $modal.open({
-                animation: true,
-                templateUrl: $rootScope.rootPath + '/static/view/usercenter/modal/homeCenter_modal.html',
-                controller: 'homeModalCtrl'
-            });
-            modalInstance.result.then(function () {
-            }, function () {
-            });
-        };
-    }]);
+	app.controller('leftNavCtrl', ["$scope", "toaster", '$modal', '$rootScope', function($scope, toaster, $modal, $rootScope){
+		//安全设置提醒框
+
+		$scope.openHomeCenterModel = function() {
+			var modalInstance = $modal.open({
+				animation: true,
+				templateUrl: $rootScope.rootPath + '/static/view/usercenter/modal/homeCenter_modal.html',
+				controller:'homeModalCtrl'
+			});
+			modalInstance.result.then(function(){
+			}, function(){
+			});
+		};
+		$scope.promptUpdate = function() {
+            if (!$scope.userInfo.pwdEnable || !$scope.userInfo.haveUserQuestion||!$scope.userInfo.emailValidCode || $scope.userInfo.emailValidCode != 2) {
+                $scope.openHomeCenterModel();
+            }
+			/*if (!$scope.userInfo.pwdEnable || !$scope.userInfo.userEmail || !$scope.userInfo.haveUserQuestion) {
+				$scope.openHomeCenterModel();
+			}*/
+		};
+	}]);
 
     function checkNullStr (str) {
         const NULL_ARR = ['空', '没', '无', '-', '—', 'null', '#N/A'];
@@ -1782,21 +1791,7 @@ define([ 'app/app' ], function(app) {
         }
     });
 
-  /**
-   * 左侧导航栏控制器
-   */
-	app.controller('leftNavCtrl', ["$scope", "toaster", function($scope, toaster){
-		$scope.promptUpdate = function() {
-            if (!$scope.userInfo.pwdEnable || !$scope.userInfo.haveUserQuestion||!$scope.userInfo.emailValidCode || $scope.userInfo.emailValidCode != 2) {
-                $scope.openHomeCenterModel();
-            }
-			/*if (!$scope.userInfo.pwdEnable || !$scope.userInfo.userEmail || !$scope.userInfo.haveUserQuestion) {
-				$scope.openHomeCenterModel();
-			}*/
-		};
-	}]);
-
-	app.controller('homeModalCtrl', ['$rootScope', '$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($rootScope, $scope, $modalInstance, toaster, $http, ShippingAddress,$state){
+    app.controller('homeModalCtrl', ['$rootScope', '$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($rootScope, $scope, $modalInstance, toaster, $http, ShippingAddress,$state){
 		$rootScope.$on('$stateChangeStart',
 			function(event, toState, toParams, fromState, fromParams){
 				$modalInstance.dismiss();
@@ -1831,5 +1826,4 @@ define([ 'app/app' ], function(app) {
 		}
 		return arr;
 	};
-
 });

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

@@ -176,9 +176,7 @@ define(['app/app'], function (app) {
 
           $scope.nowDate = new Date();
 
-          $scope.deadDate = new Date();
-          $scope.deadDate.setMonth($scope.deadDate.getMonth() + 3);
-          $scope.deadDate.setDate($scope.deadDate.getDate() + 1);
+          $scope.deadDate = new Date(Date.now() + 1000 * 60 * 60 * 24 * 30 * 3);
 
 
           $scope.checkNull = function (code) {