| Line 952... |
Line 952... |
| 952 |
|
952 |
|
| 953 |
List<CustomerOffer> customerOffers = customerOfferRepository.selectOffersByDate(todayDate);
|
953 |
List<CustomerOffer> customerOffers = customerOfferRepository.selectOffersByDate(todayDate);
|
| 954 |
List<Integer> customerOfferIds = customerOffers.stream().map(x -> x.getId()).distinct().collect(Collectors.toList());
|
954 |
List<Integer> customerOfferIds = customerOffers.stream().map(x -> x.getId()).distinct().collect(Collectors.toList());
|
| 955 |
for (CartFofo cartItem : cartItems) {
|
955 |
for (CartFofo cartItem : cartItems) {
|
| 956 |
Item item = itemRepository.selectById(cartItem.getItemId());
|
956 |
Item item = itemRepository.selectById(cartItem.getItemId());
|
| 957 |
List<CustomerOfferItem> customerOfferItems = customerOfferItemRepository.selectByOfferIds(customerOfferIds, item.getCatalogItemId(), todayDate2);
|
957 |
if (customerOfferIds.size() > 0) {
|
| 958 |
|
958 |
|
| 959 |
List<CustomerOfferItem> filteredCustomerOfferItems = customerOfferItems.stream()
|
959 |
List<CustomerOfferItem> customerOfferItems = customerOfferItemRepository.selectByOfferIds(customerOfferIds, item.getCatalogItemId(), todayDate2);
|
| 960 |
.filter(x -> x.getEndDate() != null && !x.getEndDate().isBefore(todayDate2))
|
- |
|
| 961 |
.collect(Collectors.toList());
|
- |
|
| 962 |
|
960 |
|
| - |
|
961 |
List<CustomerOfferItem> filteredCustomerOfferItems = customerOfferItems.stream()
|
| - |
|
962 |
.filter(x -> x.getEndDate() != null && !x.getEndDate().isBefore(todayDate2))
|
| - |
|
963 |
.collect(Collectors.toList());
|
| - |
|
964 |
|
| 963 |
offerItemMap.put(item.getId(), filteredCustomerOfferItems);
|
965 |
offerItemMap.put(item.getId(), filteredCustomerOfferItems);
|
| - |
|
966 |
}
|
| 964 |
|
967 |
|
| 965 |
|
968 |
|
| 966 |
List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(item.getCatalogItemId());
|
969 |
List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(item.getCatalogItemId());
|
| 967 |
webOfferMap.put(item.getId(), webOffers);
|
970 |
webOfferMap.put(item.getId(), webOffers);
|
| 968 |
}
|
971 |
}
|