Merge remote-tracking branch 'origin/feature-201826-wangcz' into feature-201826-wangcz

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

@@ -62,10 +62,10 @@ public class SeekPurchaseByBatch {
     private String encapsulation;
 
     /**
-     * 求购数量
+     * 求购数量（单位用量）
      */
     @Column(name = "sp_amount")
-    private Double amount;
+    private Double amount = 1d;
 
     /**
      * 求购单价预算

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

@@ -667,6 +667,11 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         try {
             List<SeekPurchaseByBatch> seekPurchaseByBatches = bom.getSeekPurchaseByBatchs();
             if (!CollectionUtils.isEmpty(seekPurchaseByBatches)) {
+                for (SeekPurchaseByBatch batch : seekPurchaseByBatches) {
+                    if (null == batch.getAmount()) {
+                        batch.setAmount(1d);
+                    }
+                }
                 seekPurchaseByBatchDao.save(seekPurchaseByBatches);
             }
             seekPurchaseBomDao.save(bom);
@@ -724,7 +729,12 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
             }
             List<SeekPurchaseByBatch> batches = seekPurchaseByBatchDao.findAll(ids);
             if (!CollectionUtils.isEmpty(batches)) {
-                seekPurchaseByBatchDao.delete(batches);
+                SeekPurchaseBom bom = seekPurchaseBomDao.findOne(batches.get(0).getBomId());
+                if (null != bom) {
+                    bom.setAmount(bom.getAmount() - batches.size());
+                    seekPurchaseByBatchDao.delete(batches);
+                    seekPurchaseBomDao.save(bom);
+                }
                 map.put("success", true);
             } else {
                 map.put("success", false);
@@ -801,7 +811,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
                 inquiryItem.setSource("MALL");
                 inquiryItem.setUserName(user.getUserName());
                 inquiryItem.setUserTel(user.getUserTel());
-                inquiryItem.setNeedquantity(batch.getAmount() * count);
+                inquiryItem.setNeedquantity(null != batch.getAmount() ? batch.getAmount() * count : count);
                 inquiryItem.setInbrand(batch.getBrand());
                 inquiryItem.setCurrency(batch.getCurrency());
                 inquiryItem.setCmpCode(batch.getCode().toUpperCase());