Subversion Repositories SmartDukaan

Rev

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

Rev 32887 Rev 33083
Line 334... Line 334...
334
 
334
 
335
		Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = fofoIds.stream().map(x -> customRetailerMap.get(x))
335
		Map<Integer, CustomRetailer> fofoIdsAndCustomRetailer = fofoIds.stream().map(x -> customRetailerMap.get(x))
336
				.filter(x -> x != null).collect(Collectors.toList()).stream()
336
				.filter(x -> x != null).collect(Collectors.toList()).stream()
337
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
337
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
338
 
338
 
339
		LOGGER.info("fofoIds" + fofoIds);
339
		//LOGGER.info("fofoIds" + fofoIds);
340
		model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
340
		model.addAttribute("fofoIdsAndCustomRetailer", fofoIdsAndCustomRetailer);
341
		LOGGER.info("fofoIdsAndCustomRetailer" + fofoIdsAndCustomRetailer);
341
		//LOGGER.info("fofoIdsAndCustomRetailer" + fofoIdsAndCustomRetailer);
342
		model.addAttribute("fofoIds", fofoIds);
342
		model.addAttribute("fofoIds", fofoIds);
343
 
343
 
344
		return "store";
344
		return "store";
345
 
345
 
346
	}
346
	}
Line 349... Line 349...
349
 
349
 
350
	@RequestMapping(value = "/getPartnerinfo")
350
	@RequestMapping(value = "/getPartnerinfo")
351
	public String getPartnerinfo(HttpServletRequest request, @RequestBody SelectStorePartnerInfo selectStorePartnerInfo,
351
	public String getPartnerinfo(HttpServletRequest request, @RequestBody SelectStorePartnerInfo selectStorePartnerInfo,
352
								 Model model) throws ProfitMandiBusinessException {
352
								 Model model) throws ProfitMandiBusinessException {
353
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
353
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
354
		LOGGER.info("selectStorePartnerInfo" + selectStorePartnerInfo.getUserIds());
354
		//LOGGER.info("selectStorePartnerInfo" + selectStorePartnerInfo.getUserIds());
355
		List<FofoStore> fofoStores = fofoStoreRepository.selectByRetailerIds(selectStorePartnerInfo.getUserIds());
355
		List<FofoStore> fofoStores = fofoStoreRepository.selectByRetailerIds(selectStorePartnerInfo.getUserIds());
356
		LOGGER.info("fofoStoresInfo" + fofoStores);
356
		//LOGGER.info("fofoStoresInfo" + fofoStores);
357
		Map<Integer, Boolean> investments = new HashMap<>();
357
		Map<Integer, Boolean> investments = new HashMap<>();
358
 
358
 
359
		for (FofoStore fofoStore : fofoStores) {
359
		for (FofoStore fofoStore : fofoStores) {
360
			boolean isOk = false;
360
			boolean isOk = false;
361
			if (fofoStore.getGraceDate() != null && fofoStore.getGraceDate().isAfter(LocalDate.now())) {
361
			if (fofoStore.getGraceDate() != null && fofoStore.getGraceDate().isAfter(LocalDate.now())) {