Subversion Repositories SmartDukaan

Rev

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

Rev 23939 Rev 23952
Line 260... Line 260...
260
		
260
		
261
		FofoOrder fofoOrder = fofoOrderRepository.selectByFofoIdAndOrderId(fofoDetails.getFofoId(), orderId);
261
		FofoOrder fofoOrder = fofoOrderRepository.selectByFofoIdAndOrderId(fofoDetails.getFofoId(), orderId);
262
		List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
262
		List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
263
		CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
263
		CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
264
		List<PaymentOptionTransaction> paymentOptionTransactions = fofoOrderPaymentOptionRepository.selectByReferenceIdAndType(fofoOrder.getId(), PaymentOptionReferenceType.ORDER);
264
		List<PaymentOptionTransaction> paymentOptionTransactions = fofoOrderPaymentOptionRepository.selectByReferenceIdAndType(fofoOrder.getId(), PaymentOptionReferenceType.ORDER);
-
 
265
		
-
 
266
		//Added Migration info as we lost it.
-
 
267
		if(paymentOptionTransactions== null || paymentOptionTransactions.size() == 0) {
-
 
268
			PaymentOptionTransaction pot = new PaymentOptionTransaction();
-
 
269
			pot.setAmount(fofoOrder.getTotalAmount());
-
 
270
			pot.setCreateTimestamp(fofoOrder.getCreateTimestamp());
-
 
271
			//Mark it paid through cash
-
 
272
			pot.setPaymentOptionId(1);
-
 
273
			pot.setReferenceType(PaymentOptionReferenceType.ORDER);
-
 
274
			fofoOrderPaymentOptionRepository.persist(pot);
-
 
275
			paymentOptionTransactions.add(pot);
-
 
276
			LOGGER.info("Added to get invoice");
-
 
277
		}
265
		Map<Integer, PaymentOption> paymentOptionIdPaymentOptionMap = this.paymentOptionIdPaymentOptionMap(paymentOptionTransactions);
278
		Map<Integer, PaymentOption> paymentOptionIdPaymentOptionMap = this.paymentOptionIdPaymentOptionMap(paymentOptionTransactions);
266
		List<InsurancePolicy> insurancePolicies = insurancePolicyRepository.selectByRetailerIdInvoiceNumber(fofoOrder.getFofoId(), fofoOrder.getInvoiceNumber());
279
		List<InsurancePolicy> insurancePolicies = insurancePolicyRepository.selectByRetailerIdInvoiceNumber(fofoOrder.getFofoId(), fofoOrder.getInvoiceNumber());
267
		this.addInsuranceProvider(insurancePolicies);
280
		this.addInsuranceProvider(insurancePolicies);
268
		List<PrebookingOrderItem> prebookingOrderItems = prebookingOrderItemRepository.selectByOrderId(orderId);
281
		List<PrebookingOrderItem> prebookingOrderItems = prebookingOrderItemRepository.selectByOrderId(orderId);
269
		Map<Integer, PrebookingOrderItem> itemIdPrebookingOrderItemMap = this.prebookingOrderItemToItemIdPrebookingOrderItem(prebookingOrderItems);
282
		Map<Integer, PrebookingOrderItem> itemIdPrebookingOrderItemMap = this.prebookingOrderItemToItemIdPrebookingOrderItem(prebookingOrderItems);
Line 317... Line 330...
317
		return fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS).plusDays(90).
330
		return fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS).plusDays(90).
318
		isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS));
331
		isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS));
319
	}
332
	}
320
	
333
	
321
	private boolean markDefective(FofoOrder fofoOrder) {
334
	private boolean markDefective(FofoOrder fofoOrder) {
322
		return fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS).plusDays(90).
335
		return fofoOrder.getCreateTimestamp().truncatedTo(ChronoUnit.DAYS).plusDays(180).
323
		isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS));
336
		isAfter(LocalDateTime.now().truncatedTo(ChronoUnit.DAYS));
324
		
337
		
325
	}
338
	}
326
	
339
	
327
	@RequestMapping(value = "/getSearchOrder")
340
	@RequestMapping(value = "/getSearchOrder")