Selaa lähdekoodia

fix: 处理搬单时,没有旅行社使用的共享库存返回可选房间的问题

luofeiyun 4 viikkoa sitten
vanhempi
commit
c8f1ebbb7e

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

@@ -37,6 +37,8 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginDistributorId;
+
 
 /**
  * 航次库存分配 Service 实现类
@@ -185,7 +187,8 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
             roomList = new ArrayList<>();
         }
         List<Long> roomIds = CollectionUtils.convertList(roomList, VoyageStockDistributeRoomDO::getRoomId);
-        if(CollectionUtils.isAnyEmpty(roomIds) && reqVO.getDistributorId() == null && reqVO.getStoreId() == null) {
+        Long loginDistributorId = getLoginDistributorId();
+        if(CollectionUtils.isAnyEmpty(roomIds) && loginDistributorId == null) {
             List<RoomRespDTO> canSelectRoomList = roomApi.getCanSelectRoomList(reqVO.getShipId(), reqVO.getRoomModelIdFloorList());
             roomIds = CollectionUtils.convertList(canSelectRoomList, RoomRespDTO::getId);
         }