| Line 962... |
Line 962... |
| 962 |
LOGGER.info("billedNotCancelledSerialNumbers {}", billedNotCancelledSerialNumbers);
|
962 |
LOGGER.info("billedNotCancelledSerialNumbers {}", billedNotCancelledSerialNumbers);
|
| 963 |
|
963 |
|
| 964 |
Map<String, LineItem> serialNumberMap = lineItemImeisRepository.selectByLineItemIds(new ArrayList<>(lineItemMap.keySet()))
|
964 |
Map<String, LineItem> serialNumberMap = lineItemImeisRepository.selectByLineItemIds(new ArrayList<>(lineItemMap.keySet()))
|
| 965 |
.stream().filter(x -> !serialNumbersRejected.contains(x.getSerialNumber())).collect(Collectors.toMap(x -> x.getSerialNumber(), x -> lineItemMap.get(x.getLineItemId()), (x1, x2) -> x1.getId() > x2.getId() ? x1 : x2));
|
965 |
.stream().filter(x -> !serialNumbersRejected.contains(x.getSerialNumber())).collect(Collectors.toMap(x -> x.getSerialNumber(), x -> lineItemMap.get(x.getLineItemId()), (x1, x2) -> x1.getId() > x2.getId() ? x1 : x2));
|
| 966 |
|
966 |
|
| - |
|
967 |
List<String> manuallyEligibleImeis = offerEligibleImeiRepository.selectEligibleImeisByOfferId(createOfferRequest.getId());
|
| 967 |
|
968 |
|
| 968 |
serialNumberMap = serialNumberMap.entrySet().stream().filter(x -> billedNotCancelledSerialNumbers.contains(x.getKey())).collect(Collectors.toMap(x -> x.getKey(), x -> x.getValue()));
|
969 |
serialNumberMap = serialNumberMap.entrySet().stream().filter(x -> billedNotCancelledSerialNumbers.contains(x.getKey())).collect(Collectors.toMap(x -> x.getKey(), x -> x.getValue()));
|
| - |
|
970 |
if (manuallyEligibleImeis != null) {
|
| - |
|
971 |
serialNumberMap.entrySet().stream().filter(x -> manuallyEligibleImeis.contains(x.getKey())).collect(Collectors.toMap(x -> x.getKey(), x -> x.getValue()));
|
| - |
|
972 |
}
|
| 969 |
LOGGER.info("serialNumberMap {}", serialNumberMap);
|
973 |
LOGGER.info("serialNumberMap {}", serialNumberMap);
|
| 970 |
if (serialNumberMap.size() == 0) continue;
|
974 |
if (serialNumberMap.size() == 0) continue;
|
| 971 |
Map<String, InventoryItem> serialNumberInventoryItemMap = this.getInventoryItemMap(fofoId, serialNumberMap);
|
975 |
Map<String, InventoryItem> serialNumberInventoryItemMap = this.getInventoryItemMap(fofoId, serialNumberMap);
|
| 972 |
//Continue if all imeis havent been grned
|
976 |
//Continue if all imeis havent been grned
|
| 973 |
if (serialNumberInventoryItemMap.size() < billedNotCancelledSerialNumbers.size()) continue;
|
977 |
if (serialNumberInventoryItemMap.size() < billedNotCancelledSerialNumbers.size()) continue;
|