Subversion Repositories SmartDukaan

Rev

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

Rev 20829 Rev 20830
Line 521... Line 521...
521 
	}
 521 
	}
522
522
523
523
524 
	public static List<Order> getOrdersFromThirftOrders(List<in.shop2020.model.v1.order.Order> orders, Long billingWarehouseId){
 524 
	public static List<Order> getOrdersFromThirftOrders(List<in.shop2020.model.v1.order.Order> orders, Long billingWarehouseId){
525 
		List<Order> ordersToReturn = new ArrayList<Order>();
 525 
		List<Order> ordersToReturn = new ArrayList<Order>();
526 
		Map<Long, Warehouse> warehousesMap = CatalogUtils.getAllWarehousesForBillingWarehouse(billingWarehouseId);
526 
		Map<Long, Warehouse> warehousesMap = CatalogUtils.getAllWarehousesForBillingWarehouse(0);
527 
		List<Long> itemIds = new ArrayList<Long>();
 527 
		List<Long> itemIds = new ArrayList<Long>();
528 
		Map<Long, List<in.shop2020.model.v1.order.Order>> txnOrdersMap = new HashMap<Long, List<in.shop2020.model.v1.order.Order>>();
 528 
		Map<Long, List<in.shop2020.model.v1.order.Order>> txnOrdersMap = new HashMap<Long, List<in.shop2020.model.v1.order.Order>>();
529
529
530 
		Date date = new Date(System.currentTimeMillis());
 530 
		Date date = new Date(System.currentTimeMillis());
531 
		for(in.shop2020.model.v1.order.Order t_order : orders){
 531 
		for(in.shop2020.model.v1.order.Order t_order : orders){
Line 548... Line 548...
548 
			in.shop2020.model.v1.order.TransactionService.Client tClient = new TransactionClient().getClient();
 548 
			in.shop2020.model.v1.order.TransactionService.Client tClient = new TransactionClient().getClient();
549 
			InventoryClient inventoryServiceClient = new InventoryClient();
 549 
			InventoryClient inventoryServiceClient = new InventoryClient();
550 
			InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
 550 
			InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
551 
			for(in.shop2020.model.v1.order.Order t_order : orders){
 551 
			for(in.shop2020.model.v1.order.Order t_order : orders){
552 
				LineItem lineItem = t_order.getLineitems().get(0);
 552 
				LineItem lineItem = t_order.getLineitems().get(0);
553 
				System.out.println(warehousesMap);
 - 
 
554 
				System.out.println("t_order.getFulfilmentWarehouseId() " + t_order.getFulfilmentWarehouseId());
 - 
 
555 
				System.out.println("billingWarehouseId " + billingWarehouseId);
 - 
 
556 
				String pickFromWarehouse = warehousesMap.get(t_order.getFulfilmentWarehouseId()).getDisplayName();
 553 
				String pickFromWarehouse = warehousesMap.get(t_order.getFulfilmentWarehouseId()).getDisplayName();
557 
				Item item = itemsMap.get(lineItem.getItem_id());
 554 
				Item item = itemsMap.get(lineItem.getItem_id());
558 
				in.shop2020.logistics.Provider provider = getProvidersMap().get(t_order.getLogistics_provider_id());
 555 
				in.shop2020.logistics.Provider provider = getProvidersMap().get(t_order.getLogistics_provider_id());
559 
				Warehouse fulfillmentWarehouse = warehousesMap.get(t_order.getFulfilmentWarehouseId());
 556 
				Warehouse fulfillmentWarehouse = warehousesMap.get(t_order.getFulfilmentWarehouseId());
560 
				Map<Long, Map<String, String>> acceptTogetherOrdersMap = null;
 557 
				Map<Long, Map<String, String>> acceptTogetherOrdersMap = null;
Line 842... Line 839...
842 
 
 839 
 
843 
        try {
 840 
        try {
844 
            in.shop2020.model.v1.catalog.CatalogService.Client client = new CatalogClient().getClient();
 841 
            in.shop2020.model.v1.catalog.CatalogService.Client client = new CatalogClient().getClient();
845 
            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = new InventoryClient().getClient();
 842 
            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = new InventoryClient().getClient();
846 
            item = client.getItem(lineItem.getItem_id());
 843 
            item = client.getItem(lineItem.getItem_id());
847 
            pickFromWarehouse = CatalogUtils.getWarehousesForBillingWarehouse(t_order.getWarehouse_id())
 844 
            pickFromWarehouse = CatalogUtils.getWarehousesForBillingWarehouse(0)
848 
                                    .get(t_order.getFulfilmentWarehouseId());
 845 
                                    .get(t_order.getFulfilmentWarehouseId());
849 
 
 846 
 
850 
            if (pickFromWarehouse == null) {
 847 
            if (pickFromWarehouse == null) {
851 
                Warehouse warehouse = inventoryClient.getWarehouse(t_order.getFulfilmentWarehouseId());
 848 
                Warehouse warehouse = inventoryClient.getWarehouse(t_order.getFulfilmentWarehouseId());
852 
                pickFromWarehouse = inventoryClient.getWarehouses(null, InventoryType.GOOD, warehouse.getVendor().getId(), t_order.getWarehouse_id(), 0).get(0).getDisplayName();
 849 
                pickFromWarehouse = inventoryClient.getWarehouses(null, InventoryType.GOOD, warehouse.getVendor().getId(), t_order.getWarehouse_id(), 0).get(0).getDisplayName();