Просмотр исходного кода

fix: 修改分销商库存为0的房型也要显示出来

luofeiyun 2 недель назад
Родитель
Сommit
6845a2436a

+ 3 - 2
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdistribute/VoyageStockDistributeNewServiceImpl.java

@@ -264,12 +264,13 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
         List<VoyageStockDistributeNewRespVO> list = new ArrayList<>();
         // 获取所有库存
         List<VoyageStockDetailDO> stockDetailDOList = voyageStockDetailService.getListByVoyageId(reqVO.getVoyageId());
-        List<VoyageStockDetailDO> stockDetailDOList1 = stockDetailDOList.stream().filter(item -> item.getCanSellNum().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
+        //该处注释,按要求库存为0的也要放出来
+//        List<VoyageStockDetailDO> stockDetailDOList1 = stockDetailDOList.stream().filter(item -> item.getCanSellNum().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
         //减去已分配的库存,剩下的就是共享库存
         List<VoyageStockDistributeNewDO> distributeNewList = voyageStockDistributeNewMapper.selectListByVoyageId(reqVO.getVoyageId(), reqVO.getType());
         Map<String, BigDecimal> distributeNewMap = CollectionUtils.convertMap(distributeNewList, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getNum());
 
-        stockDetailDOList1.forEach(item -> {
+        stockDetailDOList.forEach(item -> {
             BigDecimal bigDecimal = distributeNewMap.get(item.getRoomModelId() + "_" + item.getFloor());
             if (bigDecimal == null) {
                 bigDecimal = BigDecimal.ZERO;