fix: 使用共享库存时不显示房间

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

@@ -255,30 +255,9 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
      */
     private List<VoyageStockDistributeNewRespVO> getShareStockDetail(VoyageStockDistributeNewDetailReqVO reqVO) {
         List<VoyageStockDistributeNewRespVO> list = new ArrayList<>();
-        //该游轮所以的房间
-        List<RoomRespDTO> roomList = roomApi.getRoomList(reqVO.getShipId());
-        //1.排除已被分配的房间
-        List<VoyageStockDistributeRoomDO> distributeRoomList = voyageStockDistributeRoomService.getListByVoyageId(reqVO.getVoyageId(), reqVO.getType());
-        List<Long> roomIds = CollectionUtils.convertList(distributeRoomList, VoyageStockDistributeRoomDO::getRoomId);
-        List<RoomRespDTO> roomList1 = roomList.stream().filter(item -> !roomIds.contains(item.getId())).collect(Collectors.toList());
-        //2.排除已被售卖的房间
-        List<VoyageStockRoomUsedDO> usedRoomList = voyageStockRoomUsedMapper.selectListByVoyageId(reqVO.getVoyageId());
-        List<Long> usedRoomIds = CollectionUtils.convertList(usedRoomList, VoyageStockRoomUsedDO::getRoomId);
-        List<RoomRespDTO> roomList2 = roomList1.stream().filter(item -> !usedRoomIds.contains(item.getId())).collect(Collectors.toList());
-        List<VoyageStockDistributorRoomRespVO> voyageStockDistributorRoomRespVOS = new ArrayList<>();
-        roomList2.stream().forEach(item -> {
-            VoyageStockDistributorRoomRespVO respVO = new VoyageStockDistributorRoomRespVO();
-            respVO.setRoomNum(item.getRoomNum())
-                    .setFloor(item.getFloors())
-                    .setRoomModelId(item.getRoomModelId());
-            voyageStockDistributorRoomRespVOS.add(respVO);
-        });
-        Map<String, List<VoyageStockDistributorRoomRespVO>> map = CollectionUtils.convertMultiMap(voyageStockDistributorRoomRespVOS, (item) -> item.getRoomModelId() + "_" + item.getFloor());
-
         // 获取所有库存
         List<VoyageStockDetailDO> stockDetailDOList = voyageStockDetailService.getListByVoyageId(reqVO.getVoyageId());
         List<VoyageStockDetailDO> stockDetailDOList1 = stockDetailDOList.stream().filter(item -> item.getCanSellNum().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
-
         //减去已分配的库存，剩下的就是共享库存
         List<VoyageStockDistributeNewDO> distributeNewDOS = voyageStockDistributeNewMapper.selectListByVoyageId(reqVO.getVoyageId(), reqVO.getType());
         Map<String, BigDecimal> distributeNewMap = CollectionUtils.convertMap(distributeNewDOS, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getNum());
@@ -293,7 +272,6 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
                     .setFloor(item.getFloor())
                     .setRoomModelId(item.getRoomModelId())
                     .setRoomModelName(item.getRoomModelName());
-            respVO.setRoomList(map.get(item.getRoomModelId() + "_" + item.getFloor()));
             list.add(respVO);
         });
        return list;

ship-server-web/src/main/resources/application.yaml

@@ -295,6 +295,7 @@ yudao:
     ignore-visit-urls:
       - /admin-api/system/user/profile/**
     ignore-tables:
+      - area
       - system_tenant
       - system_tenant_package
       - system_dict_data