|
@@ -461,8 +461,11 @@ public class StockPreparationServiceImpl implements StockPreparationService {
|
|
|
*/
|
|
|
private void orderDelivery(List<StockPreparationVo> stockPreparationVoList, StockPreparationDto dto) {
|
|
|
|
|
|
- Map<Long, Integer> orderIdLockStorageMap = stockPreparationVoList.stream().collect(
|
|
|
- Collectors.toMap(StockPreparationVo::getOrderId, StockPreparationVo::getLockStorage, (v1, v2) -> v1));
|
|
|
+ Map<Long, Integer> orderIdLockStorageMap = stockPreparationVoList.stream().collect(Collectors.toMap(
|
|
|
+ StockPreparationVo::getOrderId,
|
|
|
+ item -> ObjectUtil.defaultIfNull(item.getLockStorage(), StatusConstant.NO),
|
|
|
+ (v1, v2) -> v1)
|
|
|
+ );
|
|
|
|
|
|
List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, orderIdLockStorageMap.keySet()));
|
|
|
List<OrderSkuBom> orderSkuBomList = orderSkuBomService.list(q -> q.in(OrderSkuBom::getOrderId, orderIdLockStorageMap.keySet()));
|