Browse Source

bom求购

liusw 8 years ago
parent
commit
0e40326fb0

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

@@ -30,6 +30,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -402,7 +403,10 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService{
         List<SeekPurchaseByBatch> deleteBatchList = new ArrayList<>();
         for (SeekPurchaseByBatch batch : seekPurchaseByBatchList) {
             SeekPurchase seekPurchase = new SeekPurchase();
-            if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand()) && !StringUtils.isEmpty(batch.getDeadline()) && batch.getDeadline().compareTo(DateUtils.addTime(new Date(), 90, 23, 59 ,59))!= 1) {
+            Calendar now = Calendar.getInstance();
+            now.add(Calendar.DAY_OF_MONTH, 90);
+            //Date deadlineMax = DateUtils.addTime(new Date(System.currentTimeMillis()), 90, 23, 59 ,59);
+            if (!StringUtils.isEmpty(batch.getCode()) && !StringUtils.isEmpty(batch.getBrand()) && !StringUtils.isEmpty(batch.getDeadline()) && batch.getDeadline().compareTo(now.getTime()) != 1) {
                 //seekPurchase = (SeekPurchase) batch;
                 seekPurchase.setDeadline(batch.getDeadline());
                 seekPurchase.setCurrency(batch.getCurrency());
@@ -431,7 +435,10 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService{
         seekPurchaseBom.setStatus(1);
         seekPurchaseBomDao.save(seekPurchaseBom);
         seekPurchaseByBatchDao.delete(deleteBatchList);
-        return ResultMap.success(haveGoodsCount);
+        Map<String, Object> result = new HashMap<>();
+        result.put("successAmount", seekPurchaseList.size());
+        result.put("goodsAmount", haveGoodsCount);
+        return ResultMap.success(result);
     }
 
     @Override

+ 1 - 1
src/main/java/com/uas/platform/b2c/trade/seek/utils/DateUtils.java

@@ -27,6 +27,6 @@ public class DateUtils {
      */
     public static Date addTime(Date date, Integer day, Integer hour, Integer minute,Integer second){
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        return new Date(date.getTime() + day * 24 * 60 * 60 * 1000 + hour * 60 * 60 * 100 + minute * 60 * 1000 + second * 1000);
+        return new Date(date.getTime() + day * 24 * 60 * 60 * 1000 + hour * 60 * 60 * 1000 + minute * 60 * 1000 + second * 1000);
     }
 }