| Line 965... |
Line 965... |
| 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 |
List<String> manuallyEligibleImeis = offerEligibleImeiRepository.selectEligibleImeisByOfferId(createOfferRequest.getId());
|
| 968 |
|
968 |
|
| 969 |
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 |
|
| - |
|
971 |
//Just a validation need to revaluate this
|
| - |
|
972 |
Map<String, InventoryItem> serialNumberInventoryItemMap = this.getInventoryItemMap(fofoId, serialNumberMap);
|
| - |
|
973 |
if (serialNumberInventoryItemMap.size() < billedNotCancelledSerialNumbers.size()) continue;
|
| - |
|
974 |
|
| 970 |
if (manuallyEligibleImeis != null) {
|
975 |
if (manuallyEligibleImeis != null) {
|
| 971 |
serialNumberMap = serialNumberMap.entrySet().stream().filter(x -> manuallyEligibleImeis.contains(x.getKey())).collect(Collectors.toMap(x -> x.getKey(), x -> x.getValue()));
|
976 |
serialNumberMap = serialNumberMap.entrySet().stream().filter(x -> manuallyEligibleImeis.contains(x.getKey())).collect(Collectors.toMap(x -> x.getKey(), x -> x.getValue()));
|
| - |
|
977 |
serialNumberInventoryItemMap = this.getInventoryItemMap(fofoId, serialNumberMap);
|
| 972 |
}
|
978 |
}
|
| 973 |
LOGGER.info("serialNumberMap {}", serialNumberMap);
|
979 |
LOGGER.info("serialNumberMap {}", serialNumberMap);
|
| 974 |
if (serialNumberMap.size() == 0) continue;
|
980 |
if (serialNumberMap.size() == 0) continue;
|
| 975 |
Map<String, InventoryItem> serialNumberInventoryItemMap = this.getInventoryItemMap(fofoId, serialNumberMap);
|
- |
|
| 976 |
//Continue if all imeis havent been grned
|
981 |
//Continue if all imeis havent been grned
|
| 977 |
if (serialNumberInventoryItemMap.size() < billedNotCancelledSerialNumbers.size()) continue;
|
- |
|
| 978 |
|
982 |
|
| 979 |
|
983 |
|
| 980 |
float eligiblePayoutValue = eligibleSlab.getPayoutAmount();
|
984 |
float eligiblePayoutValue = eligibleSlab.getPayoutAmount();
|
| 981 |
double finalPayout;
|
985 |
double finalPayout;
|
| 982 |
if (AmountType.PERCENTAGE.equals(itemCriteriaPayout.getAmountType())) {
|
986 |
if (AmountType.PERCENTAGE.equals(itemCriteriaPayout.getAmountType())) {
|