Subversion Repositories SmartDukaan

Rev

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

Rev 31049 Rev 31050
Line 215... Line 215...
215
 
215
 
216
					// Map<Integer, JSONObject> contentMap =
216
					// Map<Integer, JSONObject> contentMap =
217
					// commonSolrService.getContentByCatalogIds(catalogIds);
217
					// commonSolrService.getContentByCatalogIds(catalogIds);
218
					for (FofoOrderItem foi : fofoOrderItems) {
218
					for (FofoOrderItem foi : fofoOrderItems) {
219
 
219
 
220
						List<FofoLineItem> flis = fofoLineItemRepository.selectByFofoOrderItemId(foi.getId());
220
						List<FofoLineItem> fofoLineItems = fofoLineItemRepository.selectByFofoOrderItemId(foi.getId());
221
 
221
 
222
						CustomerOrderDetail customerOrderDetail = new CustomerOrderDetail();
222
						CustomerOrderDetail customerOrderDetail = new CustomerOrderDetail();
223
 
223
 
224
						List<String> serialNumber = flis.stream().map(x -> x.getSerialNumber())
224
						List<String> serialNumbers = fofoLineItems.stream().map(x -> x.getSerialNumber())
225
								.collect(Collectors.toList()).stream().filter(x -> x != null)
225
								.collect(Collectors.toList()).stream().filter(x -> x != null)
226
								.collect(Collectors.toList());
226
								.collect(Collectors.toList());
227
 
227
 
228
						customerOrderDetail.setSerialNumber(serialNumber);
228
						customerOrderDetail.setSerialNumber(serialNumbers);
229
 
229
 
230
						customerOrderDetail.setCustomerName(customerAddress.getName());
230
						customerOrderDetail.setCustomerName(customerAddress.getName());
231
						customerOrderDetail.setCustomerMobile(customerAddress.getPhoneNumber());
231
						customerOrderDetail.setCustomerMobile(customerAddress.getPhoneNumber());
232
						customerOrderDetail.setCustomerEmail(customer.getEmailId());
232
						customerOrderDetail.setCustomerEmail(customer.getEmailId());
233
						customerOrderDetail.setCustomerCity(customerAddress.getCity());
233
						customerOrderDetail.setCustomerCity(customerAddress.getCity());
Line 248... Line 248...
248
						customerOrderDetail.setCreatedTimeStamp(foi.getCreateTimestamp());
248
						customerOrderDetail.setCreatedTimeStamp(foi.getCreateTimestamp());
249
						customerOrderDetail.setInvoiceNumber(fo.getInvoiceNumber());
249
						customerOrderDetail.setInvoiceNumber(fo.getInvoiceNumber());
250
						customerOrderDetail.setCancelledTimestamp(fo.getCancelledTimestamp());
250
						customerOrderDetail.setCancelledTimestamp(fo.getCancelledTimestamp());
251
						customerOrderDetail.setInsurance(false);
251
						customerOrderDetail.setInsurance(false);
252
 
252
 
253
						if (!serialNumber.isEmpty()) {
253
						if (!serialNumbers.isEmpty()) {
254
 
254
 
255
							if (fo.getCreateTimestamp().toLocalDate().plusDays(10).isAfter(LocalDate.now())
255
							if (fo.getCreateTimestamp().toLocalDate().plusDays(10).isAfter(LocalDate.now())
256
									&& item.getHsnCode().equals("85171290")) {
256
									&& item.getHsnCode().equals("85171290")) {
257
								customerOrderDetail.setInsurance(true);
257
								customerOrderDetail.setInsurance(true);
258
							} else {
258
							} else {