Subversion Repositories SmartDukaan

Rev

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

Rev 29951 Rev 29957
Line 574... Line 574...
574
		Set<String> brands = mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name"))
574
		Set<String> brands = mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name"))
575
				.collect(Collectors.toSet());
575
				.collect(Collectors.toSet());
576
		brands.addAll(mongoClient.getMongoBrands(fofoId, null, 6).stream().map(x -> (String) x.get("name"))
576
		brands.addAll(mongoClient.getMongoBrands(fofoId, null, 6).stream().map(x -> (String) x.get("name"))
577
				.collect(Collectors.toSet()));
577
				.collect(Collectors.toSet()));
578
 
578
 
579
		/*
-
 
580
		 * Map<Integer, CustomRetailer> customRetailers =
-
 
581
		 * retailerService.getFofoRetailers(true); Map<Integer, PartnerType>
-
 
582
		 * fofoIdPartnerTypeMap = new HashMap<>();
-
 
583
		 *
-
 
584
		 * for (Entry<Integer, CustomRetailer> customRetailer :
-
 
585
		 * customRetailers.entrySet()) { PartnerType partnerType =
-
 
586
		 * partnerTypeChangeService.getTypeOnDate(customRetailer.getKey(),
-
 
587
		 * LocalDate.now()); fofoIdPartnerTypeMap.put(customRetailer.getKey(),
-
 
588
		 * partnerType); }
-
 
589
		 *
-
 
590
		 * Map<PartnerType, List<Integer>> partnerTypePartnersMap =
-
 
591
		 * fofoIdPartnerTypeMap.entrySet().stream().collect( Collectors.groupingBy(x ->
-
 
592
		 * x.getValue(), Collectors.mapping(x -> x.getKey(), Collectors.toList())));
-
 
593
		 */
-
 
594
		model.addAttribute("brands", brands);
579
		model.addAttribute("brands", brands);
595
		model.addAttribute("isAdmin", true);
580
		model.addAttribute("isAdmin", true);
-
 
581
		model.addAttribute("date", FormattingUtils.format(LocalDateTime.now()));
596
 
582
 
597
		return "partner-price-circular";
583
		return "partner-price-circular";
598
	}
584
	}
599
 
585
 
600
	@RequestMapping(value = "/priceCircularByBrandAndPartnerType")
586
	@RequestMapping(value = "/priceCircularByBrandAndPartnerType")