bug处理

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

@@ -302,7 +302,8 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
         SeekPurchase seekPurchase = seekPurchasedao.findOne(spId);
         // 求购数量
         Integer amount = seekPurchase.getAmount() == null ? 0 : seekPurchase.getAmount();
-        Double boughtAmount = seekPurchase.getBoughtAmount() + purchaseQuantity;
+        Double boughtAmount = seekPurchase.getBoughtAmount() == null ? 0 : seekPurchase.getBoughtAmount();
+        boughtAmount = boughtAmount + purchaseQuantity;
         if (boughtAmount >= amount) {
             seekPurchase.setDeadline(new Date(System.currentTimeMillis()));
         }

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

@@ -255,6 +255,11 @@ define(['app/app'], function (app) {
                             ? $scope.startDate.getTime() : null;
                         param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime()
                             : null;
+                      if ($scope.isSearch) {
+                        param.page = 1;
+                        params.page(1);
+                        $scope.isSearch = false;
+                      }
                         seekPurchase.getUserSeekPageInfo(param, function (data) {
                             params.total(data.totalElements);
                             $defer.resolve(data.content);
@@ -267,6 +272,7 @@ define(['app/app'], function (app) {
 
                 // 搜索
                 $scope.onSearch = function (searchStatus) {
+                  $scope.isSearch = true;
                     if (searchStatus) {
                         $scope.searchStatus = searchStatus;
                     }

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

@@ -324,16 +324,10 @@ define(['app/app'], function (app) {
             }
             $event.preventDefault();
             $event.stopPropagation();
-            item[openParam] = !item[openParam];
-            if (openParam == 'startDateOpen') {
-              if (item['endDateOpen']) {
-                item['endDateOpen'] = !item['endDateOpen'];
-              }
-            } else if (openParam == 'endDateOpen') {
-              if (item['startDateOpen']) {
-                item['startDateOpen'] = !item['startDateOpen'];
-              }
+            for (var key in item) {
+              item[key] = false;
             }
+            item[openParam] = !item[openParam];
           };
           $scope.changeEndDate = function () {
             if ($scope.condition.endDateOpen) {
@@ -658,8 +652,10 @@ define(['app/app'], function (app) {
               param.maxReleaseDate = $scope.bomSearch.endDate ? $scope.bomSearch.endDate.getTime()
                   : null;
               param.name = $scope.bomSearch.name;
+              // 返回首页
               if ($scope.isSearch) {
                 param.page = 1;
+                params.page(1);
                 $scope.isSearch = false;
               }
               seekPurchase.getSeekPurchaseBomListPage(param, function (data) {

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

@@ -27,6 +27,7 @@ define(['app/app'], function(app) {
                 param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime() : null;
               if ($scope.isSearch) {
                 param.page = 1;
+                params.page(1);
                 $scope.isSearch = false;
               }
                 seekPurchase.getMyOfferPageInfo(param, function (data) {

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

@@ -150,7 +150,6 @@ define(['app/app'], function (app) {
           $scope.saveOffer = function (seek) {
             if ($scope.checkAllOffer()) {
               $scope.saveOfferBtn = true;
-              return;
               seekPurchase.saveOffer($scope.offer, function (data) {
                 if (data.success) {
                   $scope.setSeekActive(seek, false);