Subversion Repositories SmartDukaan

Rev

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

Rev 30424 Rev 30426
Line 346... Line 346...
346 
			return null;
 346 
			return null;
347 
		}
 347 
		}
348 
		for (Ticket ticket : tickets) {
 348 
		for (Ticket ticket : tickets) {
349 
			fofoIds.add(ticket.getFofoId());
 349 
			fofoIds.add(ticket.getFofoId());
350 
		}
 350 
		}
- 
 
 351 
 
351 
		Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = retailerService.getFofoRetailers(fofoIds);
 352 
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 353 
 
- 
 
 354 
		Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 355 
				.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 356 
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
352 
		return fofoIdsAndCustomRetailer;
 357 
		return fofoIdsAndCustomRetailer;
353 
	}
 358 
	}
354 
 
 359 
 
355 
	@Override
 360 
	@Override
356 
	public List<TicketCategory> getAllTicketCategotyFromSubCategory() {
 361 
	public List<TicketCategory> getAllTicketCategotyFromSubCategory() {
Line 432... Line 437...
432 
						fofoIds = new ArrayList<>(customRetailerMap.keySet());
 437 
						fofoIds = new ArrayList<>(customRetailerMap.keySet());
433 
					}
 438 
					}
434 
 
 439 
 
435 
				}
 440 
				}
436 
				LOGGER.info("fofoIds - {}", fofoIds);
 441 
				LOGGER.info("fofoIds - {}", fofoIds);
437 
				positionRetailerMap.put(position.getId(), fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()));
 442 
				positionRetailerMap.put(position.getId(), fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 443 
						.filter(x -> x != null).collect(Collectors.toList()));
438 
 
 444 
 
439 
			}
 445 
			}
440 
		}
 446 
		}
441 
		return positionRetailerMap;
 447 
		return positionRetailerMap;
442 
	}
 448 
	}
443 
 
 449 
 
444 
	@Override
 450 
	@Override
445 
	public Map<Integer, List<CustomRetailer>> getRegionPartners(List<Position> positions) {
 451 
	public Map<Integer, List<CustomRetailer>> getRegionPartners(List<Position> positions) {
- 
 
 452 
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
446 
		Map<Integer, List<CustomRetailer>> positionIdAndpartnerRegionMap = new HashedMap<>();
 453 
		Map<Integer, List<CustomRetailer>> positionIdAndpartnerRegionMap = new HashedMap<>();
447 
		for (Position position : positions) {
 454 
		for (Position position : positions) {
448 
			List<Integer> fofoIds = partnerRegionRepository.selectByRegionId(position.getRegionId()).stream()
 455 
			List<Integer> fofoIds = partnerRegionRepository.selectByRegionId(position.getRegionId()).stream()
449 
					.map(x -> x.getFofoId()).collect(Collectors.toList());
 456 
					.map(x -> x.getFofoId()).collect(Collectors.toList());
450 
 
 457 
 
Line 452... Line 459...
452 
				if (fofoIds.contains(0)) {
 459 
				if (fofoIds.contains(0)) {
453 
					fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId()).collect(Collectors.toList());
 460 
					fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId()).collect(Collectors.toList());
454 
 
 461 
 
455 
				}
 462 
				}
456 
 
 463 
 
457 
				Map<Integer, CustomRetailer> fofoRetailers = retailerService.getFofoRetailers(fofoIds);
 464 
				Map<Integer, CustomRetailer> fofoRetailers = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 465 
						.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 466 
						.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
458 
				positionIdAndpartnerRegionMap.put(position.getRegionId(),
 467 
				positionIdAndpartnerRegionMap.put(position.getRegionId(),
459 
						new ArrayList<CustomRetailer>(fofoRetailers.values()));
 468 
						new ArrayList<CustomRetailer>(fofoRetailers.values()));
460 
			}
 469 
			}
461 
 
 470 
 
462 
		}
 471 
		}