Subversion Repositories SmartDukaan

Rev

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

Rev 30330 Rev 30426
Line 497... Line 497...
497
					List<Integer> fofoIds = pincodePartners.stream().map(x -> x.getFofoId())
497
					List<Integer> fofoIds = pincodePartners.stream().map(x -> x.getFofoId())
498
							.collect(Collectors.toList());
498
							.collect(Collectors.toList());
499
					List<Integer> activefofoIds = fofoStoreRepository.selectByRetailerIds(fofoIds).stream()
499
					List<Integer> activefofoIds = fofoStoreRepository.selectByRetailerIds(fofoIds).stream()
500
							.filter(x -> x.isActive()).map(x -> x.getId()).collect(Collectors.toList());
500
							.filter(x -> x.isActive()).map(x -> x.getId()).collect(Collectors.toList());
501
 
501
 
502
					Map<Integer, CustomRetailer> customerRetailerMap = retailerService.getFofoRetailers(activefofoIds);
502
					Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-
 
503
 
-
 
504
					Map<Integer, CustomRetailer> customerRetailerMap = activefofoIds.stream()
-
 
505
							.map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList())
-
 
506
							.stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-
 
507
 
503
					customerRetailers.addAll(customerRetailerMap.values());
508
					customerRetailers.addAll(customerRetailerMap.values());
504
 
509
 
505
				}
510
				}
506
				return responseSender.ok(customerRetailers);
511
				return responseSender.ok(customerRetailers);
507
 
512
 
Line 512... Line 517...
512
			if (pincodePartners.size() > 0) {
517
			if (pincodePartners.size() > 0) {
513
				List<Integer> fofoIds = pincodePartners.stream().map(x -> x.getFofoId()).collect(Collectors.toList());
518
				List<Integer> fofoIds = pincodePartners.stream().map(x -> x.getFofoId()).collect(Collectors.toList());
514
				List<Integer> activefofoIds = fofoStoreRepository.selectByRetailerIds(fofoIds).stream()
519
				List<Integer> activefofoIds = fofoStoreRepository.selectByRetailerIds(fofoIds).stream()
515
						.filter(x -> x.isActive()).map(x -> x.getId()).collect(Collectors.toList());
520
						.filter(x -> x.isActive()).map(x -> x.getId()).collect(Collectors.toList());
516
 
521
 
517
				Map<Integer, CustomRetailer> customerRetailerMap = retailerService.getFofoRetailers(activefofoIds);
522
				Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-
 
523
 
-
 
524
				Map<Integer, CustomRetailer> customerRetailerMap = activefofoIds.stream()
-
 
525
						.map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream()
-
 
526
						.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-
 
527
 
518
				customerRetailers.addAll(customerRetailerMap.values());
528
				customerRetailers.addAll(customerRetailerMap.values());
519
			}
529
			}
520
 
530
 
521
			return responseSender.ok(customerRetailers);
531
			return responseSender.ok(customerRetailers);
522
 
532
 
Line 535... Line 545...
535
 
545
 
536
		if (!pincodePartners.isEmpty()) {
546
		if (!pincodePartners.isEmpty()) {
537
			List<Integer> fofoIds = pincodePartners.stream().map(x -> x.getFofoId()).collect(Collectors.toList());
547
			List<Integer> fofoIds = pincodePartners.stream().map(x -> x.getFofoId()).collect(Collectors.toList());
538
			List<Integer> activefofoIds = fofoStoreRepository.selectByRetailerIds(fofoIds).stream()
548
			List<Integer> activefofoIds = fofoStoreRepository.selectByRetailerIds(fofoIds).stream()
539
					.filter(x -> x.isActive()).map(x -> x.getId()).collect(Collectors.toList());
549
					.filter(x -> x.isActive()).map(x -> x.getId()).collect(Collectors.toList());
-
 
550
 
540
			Map<Integer, CustomRetailer> customerRetailerMap = retailerService.getFofoRetailers(activefofoIds);
551
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-
 
552
 
-
 
553
			Map<Integer, CustomRetailer> customerRetailerMap = activefofoIds.stream().map(x -> customRetailerMap.get(x))
-
 
554
					.filter(x -> x != null).collect(Collectors.toList()).stream()
-
 
555
					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-
 
556
 
541
			customerRetailers.addAll(customerRetailerMap.values());
557
			customerRetailers.addAll(customerRetailerMap.values());
542
		}
558
		}
543
 
559
 
544
		logger.info("customerRetailers" + customerRetailers);
560
		logger.info("customerRetailers" + customerRetailers);
545
		return responseSender.ok(customerRetailers);
561
		return responseSender.ok(customerRetailers);