Subversion Repositories SmartDukaan

Rev

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

Rev 29409 Rev 29410
Line 694... Line 694...
694 
 
 694 
 
695 
			List<Order> vorders = orderRepository.selectByAirwayBillNumber(
 695 
			List<Order> vorders = orderRepository.selectByAirwayBillNumber(
696 
					deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));
 696 
					deliveredList.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toList()));
697 
 
 697 
 
698 
			List<Order> filteredorders = vorders.stream()
 698 
			List<Order> filteredorders = vorders.stream()
699 
					.filter(x -> (!x.getStatus().equals(OrderStatus.SHIPPED_FROM_WH)
 699 
					.filter(x -> (x.getStatus() == (OrderStatus.SHIPPED_FROM_WH)
700 
							|| !x.getStatus().equals(OrderStatus.DELIVERY_SUCCESS)))
 700 
							|| x.getStatus() != (OrderStatus.DELIVERY_SUCCESS)))
701 
					.collect(Collectors.toList());
 701 
					.collect(Collectors.toList());
702
702
703 
			LOGGER.info("filteredOrder"+ filteredorders);
 703 
			LOGGER.info("filteredOrder"+ filteredorders);
704 
 
 704 
 
705 
			if (!filteredorders.isEmpty()) {
 705 
			if (!filteredorders.isEmpty()) {