求购-bug处理以及下载模板

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseController.java

@@ -5,8 +5,10 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
+import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
+import com.uas.platform.b2c.trade.order.StringConstant.Currency;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchase;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBom;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBomList;
@@ -32,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
 
 /**
  * 求购操作接口类
@@ -259,4 +262,17 @@ public class SeekPurchaseController {
     public ResultMap updateSeekPurchaseBom(@RequestBody SeekPurchaseBom seekPurchaseBom){
         return seekPurchaseService.updateSeekPurchaseBom(seekPurchaseBom);
     }
+
+    /**
+     * bom求购模板下载
+     * @param currency
+     * @return
+     */
+    @RequestMapping(value = "/release/template", method = RequestMethod.GET)
+    public ModelAndView exportSeekPurchaseByBatch() {
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/seekPurchaseByBatch", "bom求购模板-优软商城"));
+        logger.log("求购", "下载bom求购的Excel模板");
+        return modelAndView;
+    }
 }

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

@@ -97,6 +97,9 @@ public class SeekPurchaseOfferGoods {
     @Column(name = "sp_uu")
     private Long spUu;
 
+    @Column(name = "sp_amount")
+    private Integer amount;
+
     /**
      * 卖家uu号
      */
@@ -363,4 +366,12 @@ public class SeekPurchaseOfferGoods {
     public void setBomId(Long bomId) {
         this.bomId = bomId;
     }
+
+    public Integer getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Integer amount) {
+        this.amount = amount;
+    }
 }

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

@@ -97,7 +97,7 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
         seekPurchaseOffer.setUu(user.getUserUU());
 
         // 修改求购信息
-        seekPurchase.setOfferAmount(seekPurchase.getOfferAmount() + 1);
+        seekPurchase.setOfferAmount(seekPurchase.getOfferAmount() == null ? 0 : seekPurchase.getOfferAmount() + 1);
         seekPurchase.setStatus(Status.OFFER.getValue());
         seekPurchaseDao.save(seekPurchase);
 

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

@@ -822,7 +822,7 @@
         <div class="bom-manage-header">
             <p><span ng-bind="bomTotal">56</span>&nbsp;个BOM清单</p>
             <div class="fr">
-                <a href="">下载BOM模板 <i class="fa fa-long-arrow-down"></i></a>
+                <a href="seek/release/template">下载BOM模板 <i class="fa fa-long-arrow-down"></i></a>
                 <label>导入新BOM
                     <input type="file" id="uploadCommodity" ng-file-select="" ng-change="upload()" ng-model="bomFiles" accept="*.xls,*.xlsx" ng-multiple="false"/>
                 </label>

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

@@ -523,7 +523,7 @@
                     <div class="seek-status">
                         <div ng-show="seek.goodsEnuu" class="status">已在库</div>
                         <div ng-show="!seek.goodsEnuu" class="no-grounding">未在库</div>
-                        <div class="BOM-list-btn" ng-if="bomId">BOM清单</div>
+                        <div class="BOM-list-btn" ng-if="seek.bomId">BOM清单</div>
                         <a ng-show="!seek.goodsEnuu" target="_blank" href="vendor#/vendor_upload">产品导入>></a>
                     </div>
                 </td>