| Line 954... |
Line 954... |
| 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 |
List<CustomerOfferItem> customerOfferItems = customerOfferItemRepository.selectByOfferIds(customerOfferIds, item.getCatalogItemId(), todayDate2);
|
| 958 |
|
958 |
|
| - |
|
959 |
List<CustomerOfferItem> filteredCustomerOfferItems = customerOfferItems.stream()
|
| - |
|
960 |
.filter(x -> x.getEndDate() != null && x.getEndDate().isAfter(todayDate2))
|
| - |
|
961 |
.collect(Collectors.toList());
|
| - |
|
962 |
|
| 959 |
offerItemMap.put(item.getId(), customerOfferItems);
|
963 |
offerItemMap.put(item.getId(), filteredCustomerOfferItems);
|
| 960 |
|
964 |
|
| 961 |
|
965 |
|
| 962 |
List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(item.getCatalogItemId());
|
966 |
List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(item.getCatalogItemId());
|
| 963 |
webOfferMap.put(item.getId(), webOffers);
|
967 |
webOfferMap.put(item.getId(), webOffers);
|
| 964 |
}
|
968 |
}
|
| Line 1028... |
Line 1032... |
| 1028 |
List<CustomerOffer> customerOffers = customerOfferRepository.selectOffersByDate(todayDate);
|
1032 |
List<CustomerOffer> customerOffers = customerOfferRepository.selectOffersByDate(todayDate);
|
| 1029 |
Map<Integer, CustomerOffer> customerOfferMap = customerOffers.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
|
1033 |
Map<Integer, CustomerOffer> customerOfferMap = customerOffers.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
|
| 1030 |
List<Integer> customerOfferIds = customerOffers.stream().map(x -> x.getId()).distinct().collect(Collectors.toList());
|
1034 |
List<Integer> customerOfferIds = customerOffers.stream().map(x -> x.getId()).distinct().collect(Collectors.toList());
|
| 1031 |
List<CustomerOfferItem> customerOfferItems = customerOfferItemRepository.selectByOfferIds(customerOfferIds, item.getCatalogItemId(), todayDate2);
|
1035 |
List<CustomerOfferItem> customerOfferItems = customerOfferItemRepository.selectByOfferIds(customerOfferIds, item.getCatalogItemId(), todayDate2);
|
| 1032 |
|
1036 |
|
| - |
|
1037 |
List<CustomerOfferItem> filteredCustomerOfferItems = customerOfferItems.stream()
|
| - |
|
1038 |
.filter(x -> x.getEndDate() != null && x.getEndDate().isAfter(todayDate2))
|
| - |
|
1039 |
.collect(Collectors.toList());
|
| - |
|
1040 |
|
| 1033 |
List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(item.getCatalogItemId());
|
1041 |
List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(item.getCatalogItemId());
|
| 1034 |
|
1042 |
|
| 1035 |
model.addAttribute("webOffers", webOffers);
|
1043 |
model.addAttribute("webOffers", webOffers);
|
| 1036 |
model.addAttribute("customerOfferMap", customerOfferMap);
|
1044 |
model.addAttribute("customerOfferMap", customerOfferMap);
|
| 1037 |
model.addAttribute("customerOfferItems", customerOfferItems);
|
1045 |
model.addAttribute("customerOfferItems", filteredCustomerOfferItems);
|
| 1038 |
|
1046 |
|
| 1039 |
return "upgrade-customer-offer-model";
|
1047 |
return "upgrade-customer-offer-model";
|
| 1040 |
}
|
1048 |
}
|
| 1041 |
|
1049 |
|
| 1042 |
@GetMapping("/insuranceDetails")
|
1050 |
@GetMapping("/insuranceDetails")
|