求购模块-买家中心-采纳报价

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchase.java

@@ -105,7 +105,7 @@ public class SeekPurchase {
      * 求购数量
      */
     @Column(name = "sp_amount")
-    private Long amount;
+    private Integer amount;
 
     /**
      * 求购状态
@@ -240,11 +240,11 @@ public class SeekPurchase {
         this.encapsulation = encapsulation;
     }
 
-    public Long getAmount() {
+    public Integer getAmount() {
         return amount;
     }
 
-    public void setAmount(Long amount) {
+    public void setAmount(Integer amount) {
         this.amount = amount;
     }
 

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

@@ -201,6 +201,8 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
         // 修改求购表的报价状态
         SeekPurchase seekPurchase = seekPurchasedao.findOne(spId);
         seekPurchase.setStatus(Status.ACCEPTED.getValue());
+        seekPurchase.setBoughtAmount(seekPurchase.getAmount());
+        seekPurchase.setDeadline(new Date(System.currentTimeMillis()));
         seekPurchase = seekPurchasedao.save(seekPurchase);
         // 修改报价表的状态
         SeekPurchaseOffer seekPurchaseOffer = seekPurchaseOfferDao.findOne(ofId);

src/main/webapp/resources/js/common/query/seekPurchase.js

@@ -34,6 +34,10 @@ define([ 'ngResource' ], function() {
       getMyOfferPageInfo: {
         url: 'seek/offer/getMyOfferPageInfo',
         method: 'GET'
+      },
+      updateSeekPurchaseStatus: {
+        url: 'seek/updateSeekPurchaseStatus',
+        method: 'PUT'
       }
 		});
 }])

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

@@ -13,6 +13,7 @@ define(['app/app'], function(app) {
             // 校验
           $scope.seek.deadline = new Date();
           seekPurchase.saveOneSeekPurchase($scope.seek,function(data){
+            $scope.showUseFlag = false;
             $scope.seek = null;
             $scope.seekPurchaseTableParams.reload();
             toaster.pop('success', '求购发布成功');
@@ -41,7 +42,7 @@ define(['app/app'], function(app) {
             $defer.resolve(data.content);
             $scope.seekListData = data;
           }, function (response) {
-            toaster.pop('error', '获取求购列表失败');
+            toaster.pop('error', response.data);
           });
         }
       });
@@ -54,30 +55,40 @@ define(['app/app'], function(app) {
         $scope.seekPurchaseTableParams.reload();
       }
 
+      // 采纳报价
+      $scope.adopt = function (){
+        seekPurchase.updateSeekPurchaseStatus({spId: $scope.currentOffer.spId, ofId: $scope.currentOffer.id},{}, function (data) {
+          $scope.currentOffer = null;
+          $scope.seekPurchaseTableParams.reload();
+          $scope.showUseFlag = false;
+          toaster.pop('success', '采纳报价成功');
+        }, function (response) {
+          toaster.pop('error', response.data);
+        });
+      }
+
       $scope.offerCount = 0;
       $scope.goodsCount = 0;
       $scope.setSeekStatus = function (seek, status) {
-        $scope.goodsCount = seek.goodsAmount;
+          $scope.offerCount = seek.offerAmount;
+          $scope.goodsCount = seek.goodsAmount;
           // 查看报价
-          if (status == 2) {
+          if (status == 2 && $scope.offerCount != 0) {
             seekPurchase.getSeekPurchaseOfferPageInfo({count:100,page:1,spId:seek.spId},function(data) {
                 $scope.offer = data.content;
-                $scope.offerCount = data.totalElements;
+                seek.$status = status;
             });
-          } else if (status == 1) {
+          } else if (status == 1 && $scope.goodsCount != 0) {// 查看现货
             seekPurchase.getMallGoodsList({spId: seek.spId}, function(data) {
                 $scope.goods = data;
                 initFragments();
+                seek.$status = status;
             });
+          } else if (status == 0){ // 收起
+            seek.$status = status;
           }
-          seek.$status = status;
       }
 
-      // 获取商品现货 getMallGoodsList 参数 spId
-
-      // 获取报价列表 getSeekPurchaseOfferPageInfo 参数：分页参数，spId
-
-
       $scope.condition = {endDateOpen:false, startDateOpen: false, deadlineOpen: false};
       // 打开日期选择框
       $scope.openDatePicker = function ($event, item, openParam,status) {

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -519,16 +519,17 @@
                     <span ng-switch-when="202" style="color:green;">已采纳</span>
                 </td>
                 <td class="operate-seek">
-                    <span ng-if="seek.offerAmount>0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></span>
-                    <span ng-if="seek.offerAmount>0" ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
+                    <span ng-if="seek.offerAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></span>
+                    <span ng-if="seek.offerAmount == 0 && seek.goodsAmount>0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">查看现货&nbsp;<i class="fa fa-angle-double-down"></i></span>
+                    <span ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
                 </td>
             </tr>
             <tr class="expand-row" ng-if="seek.$status == 1 || seek.$status == 2">
                 <td colspan="10">
                     <div>
                         <div class="switch-line">
-                            <a ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1)">商城现货（<span ng-bind="goodsCount"></span>）</a>
-                            <a ng-class="{'active': seek.$status == 2}"  ng-click="setSeekStatus(seek, 2)">当前报价（<span ng-bind="offerCount"></span>）</a>
+                            <a ng-disabled="goodsCount == 0" ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1)">商城现货（<span ng-bind="goodsCount"></span>）</a>
+                            <a ng-disabled="offerCount == 0" ng-class="{'active': seek.$status == 2}"  ng-click="setSeekStatus(seek, 2)">当前报价（<span ng-bind="offerCount"></span>）</a>
                         </div>
                         <div ng-show="seek.$status == 1">
                             <table>
@@ -631,7 +632,7 @@
             <div class="input-line"><i class="red-text">*</i>采购数量&nbsp;<input type="number" placeholder="请输入采购数量" class="form-control"></div>
             <div class="btn-line">
                 <a ng-click="setShowUseFlag(false)">取消</a>
-                <a>确认</a>
+                <a ng-click="adopt()">确认</a>
             </div>
         </div>
     </div>