Merge remote-tracking branch 'origin/v2' into v2

contract-service/src/main/java/com/ssy/lingxi/contract/serviceimpl/ContractPurchaseMaterielServiceImpl.java

@@ -98,8 +98,8 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat
                 }
             }
         }
-        Map<Long, CommoditySkuStockResponse> commoditySkuStock = getCommoditySkuStock(user, goodsIds,pageVO.getShopId());
-        boolean stockFlag = CollectionUtil.isNotEmpty(commoditySkuStock);
+/*暂不显示0806        Map<Long, CommoditySkuStockResponse> commoditySkuStock =  getCommoditySkuStock(user, goodsIds,pageVO.getShopId());
+        boolean stockFlag = CollectionUtil.isNotEmpty(commoditySkuStock);*/
         List<PurchaseMaterielQueryVO> resultList = result.getContent().stream().map(o -> {
             PurchaseMaterielQueryVO entity = new PurchaseMaterielQueryVO();
             entity.setId(o.getId());
@@ -126,7 +126,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat
             entity.setAssociatedBrand(o.getAssociatedBrand());
             Double contractFreeCount = o.getContractFreeCount();
             entity.setContractFreeCount((contractFreeCount==null||contractFreeCount<0)?0D:contractFreeCount);
-            if(stockFlag){
+/* 暂不显示0806           if(stockFlag){
                 CommoditySkuStockResponse stockResponse = commoditySkuStock.get(o.getAssociatedDataId());
                 if(stockResponse!=null) {
                     //供方库存
@@ -134,7 +134,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat
                 }else{
                     entity.setSupplierInventory(0D);
                 }
-            }
+            }*/
             return entity;
         }).collect(Collectors.toList());
 
@@ -205,6 +205,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat
             entity.setPurchaseCount(o.getPurchaseCount());
             entity.setBidAmount(o.getBidAmount());
             entity.setBidCount(o.getBidCount());
+            entity.setContractFreeCount(o.getBidCount());
             entity.setAssociatedDataId(o.getAssociatedDataId());
             entity.setAssociatedGoods(o.getAssociatedGoods());
             entity.setAssociatedMaterielNo(o.getAssociatedMaterielNo());