WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java

+	}
 	public Map<String, Object> getFilter(int warehouseId, String email, LocalDateTime date, LocalDateTime endDate)
 			throws ProfitMandiBusinessException {
 		Map<String, Object> map = new HashMap<>();
+		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-		Map<Integer, CustomRetailer> customRetailersMap = null;
+		Map<Integer, CustomRetailer> crm = null;
 		Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
 		AuthUser authUser = authRepository.selectByEmailOrMobile(email);
 		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
 		Set<Integer> fofoIds = null;
 					.stream().map(x -> x).collect(Collectors.toSet());
+		}
 		if (fofoIds != null) {
-			customRetailersMap = retailerService
+			crm = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null)
-					.getFofoRetailers(fofoIds.stream().map(x -> x).collect(Collectors.toList()));
+					.collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+		}
 		map.put("date", date);
 		map.put("endDate", endDate);
-		map.put("customRetailersMap", customRetailersMap);
+		map.put("customRetailersMap", crm);
 		map.put("fofoIds", fofoIds);
 		map.put("warehouseMap", warehouseMap);
 		return map;

Subversion Repositories SmartDukaan