Subversion Repositories SmartDukaan

Rev

Rev 32680 | Rev 35196 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 32680 Rev 32692
Line 253... Line 253...
253 
						customerOrderDetail.setCancelledTimestamp(fo.getCancelledTimestamp());
 253 
						customerOrderDetail.setCancelledTimestamp(fo.getCancelledTimestamp());
254 
						customerOrderDetail.setInsurance(false);
 254 
						customerOrderDetail.setInsurance(false);
255 
 
 255 
 
256 
						if (!serialNumbers.isEmpty()) {
 256 
						if (!serialNumbers.isEmpty()) {
257 
 
 257 
 
258 
							if (fo.getCreateTimestamp().toLocalDate().plusDays(10).isAfter(LocalDate.now())
 - 
 
259 
									&& item.getHsnCode().equals("85171300") || fo.getInvoiceNumber().equalsIgnoreCase("RJAMR522/82")) {
 258 
							if (item.getHsnCode().equals("85171300")) {
260 
								customerOrderDetail.setInsurance(true);
 259 
								customerOrderDetail.setInsurance(true);
261 
							} else {
 260 
							} else {
262 
								customerOrderDetail.setInsurance(false);
 261 
								customerOrderDetail.setInsurance(false);
263 
							}
 262 
							}
264 
						}
 263 
						}
265 
 
 264 
 
266 
						List<CustomerOffer> customerOffers = customerOfferRepository
 265 
						List<CustomerOffer> customerOffers = customerOfferRepository
267 
								.getCustomerOffer(LocalDateTime.now().toLocalDate().atStartOfDay()).get(uc.getUserId());
 266 
								.getCustomerOffer(LocalDate.now().atStartOfDay()).get(uc.getUserId());
268 
 
 267 
 
269 
						long offerCount = 0;
 268 
						long offerCount = 0;
270 
						if (!customerOffers.isEmpty()) {
 269 
						if (customerOffers != null && !customerOffers.isEmpty()){
271 
							List<Integer> offerIds = customerOffers.stream().map(x -> x.getId())
 270 
							List<Integer> offerIds = customerOffers.stream().map(x -> x.getId())
272 
									.collect(Collectors.toList());
 271 
									.collect(Collectors.toList());
273 
 
 272 
 
274 
							List<CustomerOfferItem> customerOfferItems = customerOfferItemRepository
 273 
							List<CustomerOfferItem> customerOfferItems = customerOfferItemRepository
275 
									.selectByOfferIds(offerIds, item.getCatalogItemId(), LocalDate.now());
 274 
									.selectByOfferIds(offerIds, item.getCatalogItemId(), LocalDate.now());