求购验收问题处理

src/main/java/com/uas/platform/b2c/prod/commodity/dao/GoodsDao.java

@@ -676,16 +676,6 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param brand
      * @return
      */
-    @Query(value = "select g from Goods g where g.code = :code and (g.brandNameCn = :brand or g.brandNameEn = :brand)")
+    @Query(value = "select g from Goods g where g.code = :code and (g.brandNameCn = :brand or g.brandNameEn = :brand) and status = 601")
     List<Goods> getGoodsByCodeAndName(@Param("code")String code, @Param("brand")String brand);
-
-    /**
-     * 判断是否用户存在相同产品
-     * @param code
-     * @param brand
-     * @param uu
-     * @return
-     */
-    @Query(value = "select g.id from Goods g where g.code = :code and (g.brandNameCn = :brand or g.brandNameEn = :brand) and g.publisherUU = :uu")
-    Long getGoodsId(@Param("code")String code, @Param("brand")String brand, @Param("uu") Long uu);
 }

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

@@ -7,6 +7,7 @@ import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchase;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseGoods;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseService;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
@@ -76,7 +77,7 @@ public class SeekPurchaseController {
      */
     @RequestMapping(value = "/saveOneSeekPurchase", method = RequestMethod.POST)
     @ResponseBody
-    public SeekPurchase saveOneSeekPurchase(@RequestBody SeekPurchase seekPurchase) {
+    public ResultMap saveOneSeekPurchase(@RequestBody SeekPurchase seekPurchase) {
         User user = SystemSession.getUser();
         logger.log("求购", "发布采购,uu为:" + user.getUserUU());
         return seekPurchaseService.saveOneSeekPurchase(seekPurchase, user);
@@ -90,7 +91,7 @@ public class SeekPurchaseController {
      * @return 更新后的求购信息
      */
     @RequestMapping(value = "/updateSeekPurchaseStatus", method = RequestMethod.PUT)
-    public SeekPurchase updateSeekPurchaseStatus(Long spId, Long ofId, Double purchaseQuantity) {
+    public ResultMap updateSeekPurchaseStatus(Long spId, Long ofId, Double purchaseQuantity) {
         logger.log("求购", "采纳报价，求购id:" + spId + ",报价id为" + ofId);
         return seekPurchaseService.updateSeekPurchaseStatus(spId, ofId, purchaseQuantity);
     }

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

@@ -7,6 +7,7 @@ import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOffer;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOfferGoods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchasePushGoods;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseOfferService;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
@@ -47,7 +48,7 @@ public class SeekPurchaseOfferController {
      */
     @RequestMapping(value = "/saveOffer", method = RequestMethod.POST)
     @ResponseBody
-    public SeekPurchaseOffer saveOffer(@RequestBody SeekPurchaseOffer seekPurchaseOffer) {
+    public ResultMap saveOffer(@RequestBody SeekPurchaseOffer seekPurchaseOffer) {
         User user = SystemSession.getUser();
         logger.log("求购", "卖家报价,企业uu号为:" + user.getUserUU());
         return seekPurchaseOfferService.saveOffer(seekPurchaseOffer, user);

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

@@ -4,7 +4,9 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOffer;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOfferGoods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchasePushGoods;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageInfo;
+import java.util.List;
 import java.util.Map;
 import org.springframework.data.domain.Page;
 
@@ -21,7 +23,7 @@ public interface SeekPurchaseOfferService {
      * @param seekPurchaseOffer 报价信息
      * @return
      */
-    SeekPurchaseOffer saveOffer(SeekPurchaseOffer seekPurchaseOffer, User user);
+    ResultMap saveOffer(SeekPurchaseOffer seekPurchaseOffer, User user);
 
     /**
      * 获取求购成交率

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

@@ -4,6 +4,7 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchase;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseGoods;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageInfo;
 import java.util.List;
 import java.util.Map;
@@ -38,7 +39,7 @@ public interface SeekPurchaseService {
      * @param seekPurchase 求购信息
      * @param user 用户信息
      */
-    SeekPurchase saveOneSeekPurchase(SeekPurchase seekPurchase, User user);
+    ResultMap saveOneSeekPurchase(SeekPurchase seekPurchase, User user);
 
     /**
      * 采纳报价
@@ -46,7 +47,7 @@ public interface SeekPurchaseService {
      * @param ofId
      * @return
      */
-    SeekPurchase updateSeekPurchaseStatus(Long spId, Long ofId, Double purchaseQuantity);
+    ResultMap updateSeekPurchaseStatus(Long spId, Long ofId, Double purchaseQuantity);
 
 
     /**

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

@@ -1,17 +1,18 @@
 package com.uas.platform.b2c.trade.seek.service.impl;
 
 import com.uas.platform.b2c.common.account.model.User;
-import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseDao;
+import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseOfferDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseOfferGoodsDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekPurchasePushGoodsDao;
-import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseOfferDao;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchase;
+import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOffer;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOfferGoods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchasePushGoods;
-import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOffer;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseOfferService;
 import com.uas.platform.b2c.trade.seek.status.Status;
+import com.uas.platform.b2c.trade.support.CodeType;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.CriterionExpression.Operator;
@@ -19,7 +20,6 @@ import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -58,20 +58,20 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
     private SeekPurchaseOfferGoodsDao seekPurchaseOfferGoodsDao;
 
     @Override
-    public SeekPurchaseOffer saveOffer(SeekPurchaseOffer seekPurchaseOffer, User user) {
+    public ResultMap saveOffer(SeekPurchaseOffer seekPurchaseOffer, User user) {
         if (user.getEnterprise() == null || !user.getEnterprise().isMallVendor()) {
-            throw new IllegalOperatorException("请开通卖家中心后再报价...");
+            return new ResultMap(CodeType.NOT_PERMIT, "请开通卖家中心后再报价");
         }
         // 不允许多次报价
         SeekPurchaseOffer oldOffer = seekPurchaseOfferDao.findByEnUuAndSpId(user.getEnterprise().getUu(), seekPurchaseOffer.getSpId());
         if (oldOffer != null) {
-            throw new IllegalOperatorException("请不要重复报价...");
+            return new ResultMap(CodeType.NOT_PERMIT, "请不要重复报价...");
         }
 
         // 不允许报价自己的求购
         SeekPurchase seekPurchase = seekPurchaseDao.getOne(seekPurchaseOffer.getSpId());
-        if (seekPurchase.getUu().equals(user.getUserUU())) {
-            throw new IllegalOperatorException("请不要报价自己的求购...");
+        if (seekPurchase.getUu().equals(user.getUserUU()) || seekPurchase.getEnUu().equals(user.getEnterprise().getUu())) {
+            return new ResultMap(CodeType.NOT_PERMIT, "请不要报价自己的求购...");
         }
 
         // 检查信息是否填写完整
@@ -79,13 +79,13 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
                 || StringUtils.isEmpty(seekPurchaseOffer.getUnitPrice()) || StringUtils
                 .isEmpty(seekPurchaseOffer.getMaxDay()) || StringUtils
                 .isEmpty(seekPurchaseOffer.getMinDay())) {
-            throw new IllegalOperatorException("请完善报价信息...");
+            return new ResultMap(CodeType.NO_INFO, "请完善报价信息...");
         }
 
         // 交期判断 上限天数≥下限天数＞0
         if (seekPurchaseOffer.getMaxDay() <= 0 || seekPurchaseOffer.getMinDay() <= 0
                 || seekPurchaseOffer.getMaxDay() < seekPurchaseOffer.getMinDay()) {
-            throw new IllegalOperatorException("交期填写有误...");
+            return new ResultMap(CodeType.PARAMETER_ERROR, "请完善报价信息...");
         }
         // 设置报价时间
         seekPurchaseOffer.setOfferTime(new Date(System.currentTimeMillis()));
@@ -100,8 +100,8 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
         seekPurchase.setStatus(Status.OFFER.getValue());
         seekPurchaseDao.save(seekPurchase);
 
-        seekPurchaseOffer = seekPurchaseOfferDao.save(seekPurchaseOffer);
-        return seekPurchaseOffer;
+        seekPurchaseOfferDao.save(seekPurchaseOffer);
+        return ResultMap.success(null);
     }
 
     @Override

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

@@ -15,7 +15,8 @@ import com.uas.platform.b2c.trade.seek.model.SeekPurchaseGoods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOffer;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseService;
 import com.uas.platform.b2c.trade.seek.status.Status;
-import com.uas.platform.core.exception.IllegalOperatorException;
+import com.uas.platform.b2c.trade.support.CodeType;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.CriterionExpression.Operator;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
@@ -102,12 +103,12 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
     }
 
     @Override
-    public SeekPurchase saveOneSeekPurchase(SeekPurchase seekPurchase, User user) {
+    public ResultMap saveOneSeekPurchase(SeekPurchase seekPurchase, User user) {
         // 检查信息是否完整
         if (seekPurchase == null
                 || StringUtils.isEmpty(seekPurchase.getCode()) || StringUtils
                 .isEmpty(seekPurchase.getBrand()) || StringUtils.isEmpty(seekPurchase.getCode())) {
-            throw new IllegalOperatorException("请完善求购信息...");
+            return new ResultMap(CodeType.NO_INFO, "请完善求购信息...");
         }
         // 匹配类目
         String kind = "";
@@ -143,16 +144,16 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
             seekPurchase.setEnterprise(user.getEnterprise());
         }
         seekPurchase.setUser(user);
-        seekPurchase = seekPurchasedao.save(seekPurchase);
-
-        // 匹配商城现货
-        List<Goods> goods = goodsDao
-                .getGoodsByCodeAndName(seekPurchase.getCode(), seekPurchase.getBrand());
-        return seekPurchase;
+        // 币别设空判断
+        if (seekPurchase.getUnitPrice() == null) {
+            seekPurchase.setCurrency(null);
+        }
+        seekPurchasedao.save(seekPurchase);
+        return ResultMap.success(null);
     }
 
     @Override
-    public SeekPurchase updateSeekPurchaseStatus(Long spId, Long ofId, Double purchaseQuantity) {
+    public ResultMap updateSeekPurchaseStatus(Long spId, Long ofId, Double purchaseQuantity) {
         // 修改求购表的报价状态
         SeekPurchase seekPurchase = seekPurchasedao.findOne(spId);
         seekPurchase.setStatus(Status.ACCEPTED.getValue());
@@ -163,8 +164,7 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
         SeekPurchaseOffer seekPurchaseOffer = seekPurchaseOfferDao.findOne(ofId);
         seekPurchaseOffer.setStatus(Status.ACCEPTED.getValue());
         seekPurchaseOfferDao.save(seekPurchaseOffer);
-        // 修改中间表的状态
-        return seekPurchase;
+        return ResultMap.success(null);
     }
 
     @Override

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

@@ -409,7 +409,7 @@
                     <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
                     <td class="operate">
                         <a>联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                        <div ng-click="setSeekActive(seek, true)">我要报价</div>
+                        <div ng-if="seek.remainingTime > 0" ng-click="setSeekActive(seek, true)">我要报价</div>
                     </td>
                 </tr>
                 <tr class="say-price">