ソースを参照

发布bom求购时,不再使用明细中的deadline判断截止日期。

dongbw 7 年 前
コミット
7c9e883738

+ 10 - 3
src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -498,6 +498,9 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
 
     @Override
     public ResultMap confirmBom(Long bomId, String url, Long endTime, Integer count) {
+        if (null == endTime || null == count) {
+            return new ResultMap(CodeType.NO_INFO, "存在未传入必需参数");
+        }
         SeekPurchaseBom seekPurchaseBom = seekPurchaseBomDao.findOne(bomId);
         List<SeekPurchaseByBatch> seekPurchaseByBatchList = seekPurchaseByBatchDao.findByBomId(bomId);
         return publishBomInquiry(url, seekPurchaseByBatchList, seekPurchaseBom, endTime, count);
@@ -624,6 +627,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         if (!StringUtils.isEmpty(keyword)) {
             pageInfo.expression(PredicateUtils.like("name", keyword, false));
         }
+        pageInfo.expression(PredicateUtils.eq("enuu", SystemSession.getUser().getEnterprise().getUu(), false));
         return seekPurchaseBomDao.findAll(new Specification<SeekPurchaseBom>() {
             @Override
             public Predicate toPredicate(Root<SeekPurchaseBom> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -781,6 +785,11 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
      * @return 处理结果
      */
     private ResultMap publishBomInquiry(String url, List<SeekPurchaseByBatch> seekPurchaseByBatchList, SeekPurchaseBom seekPurchaseBom, Long endTime, Integer count) {
+        Calendar now = Calendar.getInstance();
+        now.add(Calendar.DAY_OF_MONTH, 91);
+        if (endTime > now.getTimeInMillis()) {
+            return new ResultMap(CodeType.PARAMETER_ERROR, "截止日期最迟不能超过三个月");
+        }
         PurcInquiry inquiry = new PurcInquiry();
         User user = SystemSession.getUser();
         // 商城现货的数量
@@ -789,9 +798,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         Date endDate = new Date(endTime);
         for (SeekPurchaseByBatch batch : seekPurchaseByBatchList) {
             SeekPurchase seekPurchase = new SeekPurchase();
-            Calendar now = Calendar.getInstance();
-            now.add(Calendar.DAY_OF_MONTH, 91);
-            if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand()) && !StringUtils.isEmpty(batch.getDeadline()) && batch.getDeadline().compareTo(now.getTime()) != 1) {
+            if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand())) {
                 PurcInquiryItem inquiryItem = new PurcInquiryItem();
                 inquiryItem.setProdTitle(batch.getCode());
                 inquiryItem.setUserUU(user.getUserUU());