WebSVN – SmartDukaan – Diff – /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java

 	private static long GREEN_AND_IN_RED_OR_WHITE = 3L;
 	private static long ALL_RED = 4L;
 	private static long ALL_PURPLE = 5L;
 	private static long PURPLE_AND_IN_RED_OR_WHITE = 6L;
 	private static long ALL_OTHERS = 7L;
 	private static int categoryOrderCount = 0;
+	private static SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy");
+	private static SimpleDateFormat newSdf = new SimpleDateFormat("yyyy-MM-dd");
+	private static NumberFormat formatter = new DecimalFormat("#0.000");
+	private static NumberFormat rformatter = new DecimalFormat("#0.00");
+	private static  Map<Long, in.shop2020.logistics.Provider> getProvidersMap() {
+		if(providersMap==null){
+			try {
+				in.shop2020.logistics.LogisticsService.Client logisticsClient = new LogisticsClient().getClient();
+				List<in.shop2020.logistics.Provider> providers = logisticsClient.getAllProviders();
+				providersMap = new HashMap<Long, in.shop2020.logistics.Provider>();
+				for(in.shop2020.logistics.Provider provider : providers){
+					providersMap.put(provider.getId(), provider);
+				}
+			}catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return providersMap;
+	}
+	private static Map<Long, in.shop2020.logistics.Provider> providersMap = null;
 	private static Map<Long, OrderCategory> categoryStrMap = new HashMap<Long, OrderCategory>();
 	private static enum ColorCode {
 	 * @param offset
 	 *            Offset to start from
 	 * @param limit
 	 *            No. of orders to return
 	 * @param warehouseId
-	 *            The warehouse for which the orders should be queried.
+	 *            The billing warehouse for which the orders should be queried.
 	 * @return A list of orders of the given type to be fulfilled from the given
 	 *         warehouse
 	 */
 	public static List<Order> getOrders(OrderType type, long offset, long limit, long warehouseId, long source, OrderCategory orderCategory){
 		List<OrderStatus> statuses = getStatuses(type);
 				}else{
 					t_orders.addAll(client.getOrdersInBatch(statuses, offset, limit, warehouseId, source));
+				}
+			}
-			orders = getOrdersFromThirftOrders(t_orders);
+			orders = getOrdersFromThirftOrders(t_orders, warehouseId);
 			/*for (in.shop2020.model.v1.order.Order t_order: t_orders){
 				Order o = getOrderFromThriftOrder(t_order);
 				orders.add(o);
 			}*/
 			if(type==OrderType.NEW || type==OrderType.ALL_PENDING || type ==OrderType.LOW_INVENTORY || type == OrderType.PO_RAISED
+		}
 		return true;
+	}
-	public static List<Order> getOrdersFromThirftOrders(List<in.shop2020.model.v1.order.Order> orders){
+	public static List<Order> getOrdersFromThirftOrders(List<in.shop2020.model.v1.order.Order> orders, Long billingWarehouseId){
 		List<Order> ordersToReturn = new ArrayList<Order>();
-		Map<Long, Warehouse> warehousesMap = CatalogUtils.getAllWarehousesForBillingWarehouse(0);
+		Map<Long, Warehouse> warehousesMap = CatalogUtils.getAllWarehousesForBillingWarehouse(billingWarehouseId);
 		List<Long> itemIds = new ArrayList<Long>();
 		Map<Long, List<in.shop2020.model.v1.order.Order>> txnOrdersMap = new HashMap<Long, List<in.shop2020.model.v1.order.Order>>();
-		SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy");
-		SimpleDateFormat newSdf = new SimpleDateFormat("yyyy-MM-dd");
-		NumberFormat formatter = new DecimalFormat("#0.000");
-		NumberFormat rformatter = new DecimalFormat("#0.00");
 		Date date = new Date(System.currentTimeMillis());
 		for(in.shop2020.model.v1.order.Order t_order : orders){
 			if(!itemIds.contains(t_order.getLineitems().get(0).getItem_id())){
 				itemIds.add(t_order.getLineitems().get(0).getItem_id());
+			}
 			txnOrdersMap.put(t_order.getTransactionId(), txnOrders);
+		}
 		try {
 			in.shop2020.model.v1.catalog.CatalogService.Client client = new CatalogClient().getClient();
 			Map<Long, Item> itemsMap = client.getItems(itemIds);
-			in.shop2020.logistics.LogisticsService.Client logisticsClient = new LogisticsClient().getClient();
-			List<in.shop2020.logistics.Provider> providers = logisticsClient.getAllProviders();
-			Map<Long,in.shop2020.logistics.Provider> providersMap = new HashMap<Long, in.shop2020.logistics.Provider>();
-			for(in.shop2020.logistics.Provider provider : providers){
-				providersMap.put(provider.getId(), provider);
-			}
 			in.shop2020.model.v1.order.TransactionService.Client tClient = new TransactionClient().getClient();
 			InventoryClient inventoryServiceClient = new InventoryClient();
 			InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
 			for(in.shop2020.model.v1.order.Order t_order : orders){
 				LineItem lineItem = t_order.getLineitems().get(0);
 				String pickFromWarehouse = warehousesMap.get(t_order.getFulfilmentWarehouseId()).getDisplayName();
 				Item item = itemsMap.get(lineItem.getItem_id());
-				in.shop2020.logistics.Provider provider = providersMap.get(t_order.getLogistics_provider_id());
+				in.shop2020.logistics.Provider provider = getProvidersMap().get(t_order.getLogistics_provider_id());
 				Warehouse fulfillmentWarehouse = warehousesMap.get(t_order.getFulfilmentWarehouseId());
 				Map<Long, Map<String, String>> acceptTogetherOrdersMap = null;
 				Map<Long, Map<String, String>> billTogetherOrdersMap = null;
 				if(!t_order.isSetAccepted_timestamp()){
 					acceptTogetherOrdersMap = new HashMap<Long, Map<String, String>>();
 				"VirtualWarehouses", CacheManager.create());
 		List<Long> virtualWarehouseIds = virtualWhCache.get("virtual_warehouses");
 		if(virtualWarehouseIds!=null && virtualWarehouseIds.size()>0){
-			System.out.println("Virtual Warehouse Exists");
-			logger.info("Virtual Warehouse Exists");
 			return virtualWarehouseIds;
 		}else{
-			System.out.println("Virtual Warehouse Not Exists");
-			logger.info("Virtual Warehouse Not Exists");
+			logger.info("Virtual Warehouse Not Exists, creating them");
 			virtualWarehouseIds = new ArrayList<Long>();
 			try{
 				in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = new InventoryClient().getClient();
 				List<Warehouse> allWarehouses = inventoryClient.getWarehouses(null, null, 0, 0, 0);
 				for(Warehouse wh:allWarehouses){

Subversion Repositories SmartDukaan

(root)/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java – Rev 19690 → 20776