Merge branch 'dev-mysql' into feature_release-tomysql

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

@@ -430,7 +430,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         for (SeekPurchaseByBatch batch : seekPurchaseByBatchList) {
             SeekPurchase seekPurchase = new SeekPurchase();
             Calendar now = Calendar.getInstance();
-            now.add(Calendar.DAY_OF_MONTH, 90);
+            now.add(Calendar.DAY_OF_MONTH, 91);
             //Date deadlineMax = DateUtils.addTime(new Date(System.currentTimeMillis()), 90, 23, 59 ,59);
             if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand()) && !StringUtils.isEmpty(batch.getDeadline()) && batch.getDeadline().compareTo(now.getTime()) != 1) {
                 //seekPurchase = (SeekPurchase) batch;

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

@@ -275,7 +275,7 @@ define(['app/app'], function (app) {
           $scope.checkAmount = function () {
             $scope.validObj.amount = $scope.applyObj.amount === '' ? true
                 : $scope.applyObj.amount > 0 && $scope.applyObj.amount
-                < 100000000;
+                < 1000000000;
             return $scope.validObj.amount;
           }
           $scope.checkAll = function () {