Subversion Repositories SmartDukaan

Rev

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

Rev 30449 Rev 30527
Line 739... Line 739...
739 
				.filter(x -> x.getId() == fofoOrder.getCustomerAddressId()).findFirst().get();
 739 
				.filter(x -> x.getId() == fofoOrder.getCustomerAddressId()).findFirst().get();
740 
 
 740 
 
741 
		Integer stateId = null;
 741 
		Integer stateId = null;
742 
		if (customerAddress.getState().equals(retailerAddress.getState())) {
 742 
		if (customerAddress.getState().equals(retailerAddress.getState())) {
743 
			try {
 743 
			try {
- 
 
 744 
				// stateId =
744 
				stateId = Long.valueOf(Utils.getStateInfo(customerAddress.getState()).getId()).intValue();
 745 
				// Long.valueOf(Utils.getStateInfo(customerAddress.getState()).getId()).intValue();
- 
 
 746 
 
- 
 
 747 
				stateId = Long.valueOf(stateRepository.selectByName(customerAddress.getState()).getId()).intValue();
745 
			} catch (Exception e) {
 748 
			} catch (Exception e) {
746 
				LOGGER.error("Unable to get state rates");
 749 
				LOGGER.error("Unable to get state rates");
747 
			}
 750 
			}
748 
		}
 751 
		}
749 
		CustomOrderItem cli = pdfModel.getOrderItems().stream().findFirst().get();
 752 
		CustomOrderItem cli = pdfModel.getOrderItems().stream().findFirst().get();
Line 1705... Line 1708...
1705 
		Address retailerAddress = addressRepository.selectById(retailerAddressId);
 1708 
		Address retailerAddress = addressRepository.selectById(retailerAddressId);
1706 
 
 1709 
 
1707 
		Integer stateId = null;
 1710 
		Integer stateId = null;
1708 
		if (customerAddress.getState().equalsIgnoreCase(retailerAddress.getState())) {
 1711 
		if (customerAddress.getState().equalsIgnoreCase(retailerAddress.getState())) {
1709 
			try {
 1712 
			try {
1710 
				stateId = Long.valueOf(Utils.getStateInfo(customerAddress.getState()).getId()).intValue();
 1713 
				stateId = Long.valueOf(stateRepository.selectByName(customerAddress.getState()).getId()).intValue();
1711 
			} catch (Exception e) {
 1714 
			} catch (Exception e) {
1712 
				LOGGER.error("Unable to get state rates");
 1715 
				LOGGER.error("Unable to get state rates");
1713 
			}
 1716 
			}
1714 
		}
 1717 
		}
1715 
		List<Integer> itemIds = fofoOrderItems.stream().map(x -> x.getItemId()).collect(Collectors.toList());
 1718 
		List<Integer> itemIds = fofoOrderItems.stream().map(x -> x.getItemId()).collect(Collectors.toList());
Line 2001... Line 2004...
2001 
		Root<FofoOrder> fofoOrder = query.from(FofoOrder.class);
 2004 
		Root<FofoOrder> fofoOrder = query.from(FofoOrder.class);
2002 
		Root<FofoOrderItem> fofoOrderItem = query.from(FofoOrderItem.class);
 2005 
		Root<FofoOrderItem> fofoOrderItem = query.from(FofoOrderItem.class);
2003 
		Root<TagListing> tagListingRoot = query.from(TagListing.class);
 2006 
		Root<TagListing> tagListingRoot = query.from(TagListing.class);
2004 
		Root<Item> itemRoot = query.from(Item.class);
 2007 
		Root<Item> itemRoot = query.from(Item.class);
2005 
 
 2008 
 
2006 
 
 - 
 
2007 
		Predicate p2 = cb.between(fofoOrder.get(ProfitMandiConstants.CREATE_TIMESTAMP), lastCredit,
 2009 
		Predicate p2 = cb.between(fofoOrder.get(ProfitMandiConstants.CREATE_TIMESTAMP), lastCredit,
2008 
				LocalDate.now().atStartOfDay());
 2010 
				LocalDate.now().atStartOfDay());
2009 
		Predicate p3 = cb.isNull(fofoOrder.get("cancelledTimestamp"));
 2011 
		Predicate p3 = cb.isNull(fofoOrder.get("cancelledTimestamp"));
2010 
		Predicate joinPredicate = cb.and(
 2012 
		Predicate joinPredicate = cb.and(
2011 
				cb.equal(fofoOrder.get(ProfitMandiConstants.ID), fofoOrderItem.get(ProfitMandiConstants.ORDER_ID)),
 2013 
				cb.equal(fofoOrder.get(ProfitMandiConstants.ID), fofoOrderItem.get(ProfitMandiConstants.ORDER_ID)),
2012 
				cb.equal(fofoOrderItem.get("itemId"), tagListingRoot.get("itemId")),
 2014 
				cb.equal(fofoOrderItem.get("itemId"), tagListingRoot.get("itemId")),
2013 
				cb.equal(itemRoot.get("id"), tagListingRoot.get("itemId")),
 2015 
				cb.equal(itemRoot.get("id"), tagListingRoot.get("itemId")),
2014 
				cb.equal(fofoOrder.get(ProfitMandiConstants.FOFO_ID), fofoId)
 2016 
				cb.equal(fofoOrder.get(ProfitMandiConstants.FOFO_ID), fofoId));
2015 
		);
 - 
 
2016 
		ItemCriteria itemCriteria = new ItemCriteria();
 2017 
		ItemCriteria itemCriteria = new ItemCriteria();
2017 
		itemCriteria.setBrands(mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name"))
 2018 
		itemCriteria.setBrands(mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name"))
2018 
				.collect(Collectors.toList()));
 2019 
				.collect(Collectors.toList()));
2019 
		float startValue = 12000;
 2020 
		float startValue = 12000;
2020 
		itemCriteria.setStartPrice(startValue);
 2021 
		itemCriteria.setStartPrice(startValue);