WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java

 				return "schemes";
 			} else {
 				throw new ProfitMandiBusinessException("SchemeId", searchScheme, "SchemeId Not Found");
+			}
 		} else if (searchModel > 0) {
-			TagListing tagListing = null;
 			Item item = itemRepository.selectAllByCatalogItemId(searchModel).get(0);
-			tagListing = tagListingRepository.selectByItemId(item.getId());
+			TagListing tagListing = tagListingRepository.selectByItemId(item.getId());
-			model.addAttribute("modelName", item.getItemDescriptionNoColor());
 			if (tagListing != null) {
 				model.addAttribute("dp", tagListing.getSellingPrice());
 				model.addAttribute("mop", tagListing.getMop());
+			}
+			model.addAttribute("modelName", item.getItemDescriptionNoColor());
+			if (isAdmin) {
-			schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchModel, isAdmin, offset, limit)
+				schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchModel, isAdmin, offset, limit)
-					.stream().filter(x -> {
+						.stream().filter(x -> {
-						return (x.getId() != 411 && x.getId() != 612) || date1.isBefore(LocalDate.of(2021, 12, 1));
+							return (x.getId() != 411 && x.getId() != 612) || date1.isBefore(LocalDate.of(2021, 12, 1));
-					}).collect(Collectors.toList());
+						}).collect(Collectors.toList());
-			// Remove 411 and 612
+				// Remove 411 and 612
-			this.setSchemeAmountModel(schemes);
+				this.setSchemeAmountModel(schemes);
-			model.addAttribute("schemes", schemes);
+				model.addAttribute("schemes", schemes);
-			// For 7720(HR) remove investment
+				// For 7720(HR) remove investment
-			//int nlc = this.getNlc(item, loginDetails.getFofoId(), schemes, tagListing, searchModel);
+				//int nlc = this.getNlc(item, loginDetails.getFofoId(), schemes, tagListing, searchModel);
-			//model.addAttribute("nlc", Math.round(nlc));
+				//model.addAttribute("nlc", Math.round(nlc));
-			return "schemes";
+				return "schemes";
+			} else {
+				partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(), date);
+				schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchModel, isAdmin, offset, limit)
+						.stream().filter(x -> {
+							return (x.getId() != 411 && x.getId() != 612) || date1.isBefore(LocalDate.of(2021, 12, 1));
+						}).collect(Collectors.toList());
+				// Remove 411 and 612
+				//this.setSchemeAmountModel(schemes);
+				int nlc = this.getNlc(item, loginDetails.getFofoId(), schemes, tagListing);
+				// For 7720(HR) remove investment
+				model.addAttribute("schemes", schemes);
+				model.addAttribute("nlc", Math.round(nlc));
+				model.addAttribute("fofoId", loginDetails.getFofoId());
+				return "schemes-partner";
+			}
 		} else if (org.apache.commons.lang3.StringUtils.isNotEmpty(searchImei)) {
 			LOGGER.info("searchImei" + searchImei);
+					}
 					schemeMap = schemes.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
+				}
+			}
+			model.addAttribute("fofoId", loginDetails.getFofoId());
 			model.addAttribute("schemeMap", schemeMap);
 			model.addAttribute("item", item);
 			model.addAttribute("schemeInOut", schemeInOut);
 			return "schemes-partner";
+		}
 			return "schemes-partner";
+		}
+	}
-	private int getNlc(Item item, int fofoId, List<Scheme> schemes, TagListing tagListing, int itemId)
+	private int getNlc(Item item, int fofoId, List<Scheme> schemes, TagListing tagListing)
 			throws ProfitMandiBusinessException {
+		int itemId = item.getId();
 		if (item.getBrand().equals("Vivo") && fofoStoreRepository.getWarehousePartnerMap().get(7720).stream()
 				.filter(x -> x.getId() == fofoId).count() > 0) {
 			schemes = schemes.stream().filter(x -> !x.getType().equals(SchemeType.INVESTMENT))
 					.collect(Collectors.toList());
+		}
 		List<LastMonthCreditedIncomeModel> lastMonthPurchaseInMargins = schemeInOutRepository
 				.selectLastMonthPurchaseInMarginByFofoId(loginDetails.getFofoId(), currentStartMonth, currentDate);
 		List<LastMonthCreditedIncomeModel> lastMonthFrontEndIncomes = schemeInOutRepository
 				.selectFrontIncomeByBrand(loginDetails.getFofoId(), currentStartMonth, currentDate);
-		Map<String,LastMonthCreditedIncomeModel>lastMonthPendingIncomeMap = schemeInOutRepository
-				.selectLastMonthPendingIncomeByFofoId(loginDetails.getFofoId(), currentStartMonth, currentDate).stream().collect(Collectors.toMap(x-> x.getBrand(), x-> x));
+		Map<String, LastMonthCreditedIncomeModel> lastMonthPendingIncomeMap = schemeInOutRepository
+				.selectLastMonthPendingIncomeByFofoId(loginDetails.getFofoId(), currentStartMonth, currentDate).stream().collect(Collectors.toMap(x -> x.getBrand(), x -> x));
 		LOGGER.info("lastMonthCreditedIncomeModels" + lastMonthCreditedIncomeModels);
 		LOGGER.info("lastMonthFrontEndIncomes" + lastMonthFrontEndIncomes);
 		LOGGER.info("lastMonthPurchaseInMargins" + lastMonthPurchaseInMargins);
 		LOGGER.info("lastMonthCategoryUpgradeMarginMap" + lastMonthCategoryUpgradeMarginMap);
 				totalAmountMap.put(brand, 0f);
+			}
 			totalAmountMap.put(brand, totalAmountMap.get(brand) + amount);
 		});
 		lastMonthPendingIncomeMap.entrySet().stream().forEach(x -> {
 			String brand = x.getKey();
 			float amount = x.getValue().getAmount();
 			if (!totalAmountMap.containsKey(brand)) {
 				totalAmountMap.put(brand, 0f);
 				.selectLastMonthFrontEndImei(loginDetails.getFofoId(), catalogItemId, lastMonthStart, currentMonthEnd);
 		List<LastMonthImeiModel> lmpi = schemeInOutRepository.selectLastMonthPurchaseInImei(loginDetails.getFofoId(),
 				catalogItemId, lastMonthStart, currentMonthEnd);
 		List<LastMonthImeiModel> lmci = schemeInOutRepository.selectLastMonthCreditedImei(loginDetails.getFofoId(),
 				catalogItemId, lastMonthStart, currentMonthEnd);
 		LOGGER.info("lmci {}", lmci);
 		Map<String, Double> lastmonthCategoryUpgradeMargin = schemeInOutRepository
 				.selectLastMonthCategoryUpgradeMarginByImei(loginDetails.getFofoId(), catalogItemId, lastMonthStart,
 						currentMonthEnd)
 		List<String> allImeiList = new ArrayList<>(allImeiSet);
 		LOGGER.info("allImeiList" + allImeiList);
 		LOGGER.info("lmcm" + lastmonthCategoryUpgradeMargin);
 		List<LastMonthFrontEndImeiModel> lastMonthFrontEndImeis = schemeInOutRepository
 				.selectLastMonthFrontEndByImei(loginDetails.getFofoId(), allImeiList);
 		List<LastMonthImeiModel> lastMonthPurchaseInImeis = schemeInOutRepository
 				.selectLastMonthPurchaseInByImei(loginDetails.getFofoId(), allImeiList);
 		List<LastMonthImeiModel> lastMonthCreditedImeis = schemeInOutRepository
 				.selectLastMonthCreditedByImei(loginDetails.getFofoId(), allImeiList);
 		LOGGER.info("lastMonthFrontEndImei {}", lastMonthFrontEndImeis);
 		LOGGER.info("lastMonthPurchaseInImei {}", lastMonthPurchaseInImeis);
 		LOGGER.info("lastMonthCreditedImei {}", lastMonthCreditedImeis);
-		Map<String, Float>  imeiWisePendingSaleAmount =	lastMonthCreditedImeis.stream().filter(x->x.getStatus().equals(SchemePayoutStatus.PENDING) ).collect(Collectors.toMap(x->x.getImei(), x->x.getPendingSaleAmount()));
+		Map<String, Float> imeiWisePendingSaleAmount = lastMonthCreditedImeis.stream().filter(x -> x.getStatus().equals(SchemePayoutStatus.PENDING)).collect(Collectors.toMap(x -> x.getImei(), x -> x.getPendingSaleAmount()));
 		Map<IncomeImeiDate, Map<String, Double>> lastMonthPurchaseInMapPairMap = lastMonthPurchaseInImeis.stream()
 				.collect(Collectors.groupingBy(x -> new IncomeImeiDate(x.getImei(), x.getCreateTimeStamp()),
 						Collectors.groupingBy(x -> x.getDescription(), Collectors.summingDouble(x -> x.getAmount()))));
 		Map<IncomeImeiDate, Map<String, Double>> lastMonthCreditedMapPairMap = lastMonthCreditedImeis.stream()
 		purchaseSet.addAll(lastMonthPurchaseInImeis.stream().map(x -> x.getDescription()).collect(Collectors.toList()));
 		saleSet.addAll(lastMonthCreditedImeis.stream().map(x -> x.getDescription()).collect(Collectors.toList()));
 		List<String> purchaseList = new ArrayList<>(purchaseSet);
 		List<String> saleList = new ArrayList<>(saleSet);
 		Map<IncomeImeiDate, ImeiWiseIncomePairAndMapModel> imeiWiseIncomeMapOfMap = new HashMap<>();
 		for (Map.Entry<IncomeImeiDate, Map<String, Double>> entry : lastMonthPurchaseInMapPairMap.entrySet()) {
 			IncomeImeiDate imeiDate = entry.getKey();
 			Map<String, Double> descriptionAmountMap = entry.getValue();
 		return "last-month-imei-wise-income";
+	}
 	@RequestMapping(value = "/brandWiseIncome", method = RequestMethod.GET)
 	public String getBrandWiseIncome(HttpServletRequest request,
-							 @RequestParam(name = "brand", required = false, defaultValue = "") String brand,
+									 @RequestParam(name = "brand", required = false, defaultValue = "") String brand,
-							 @RequestParam(name = "status", required = false, defaultValue = "") String status,
+									 @RequestParam(name = "status", required = false, defaultValue = "") String status,
-							 @RequestParam(name = "month", required = false, defaultValue = "") int month, Model model)
+									 @RequestParam(name = "month", required = false, defaultValue = "") int month, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		LOGGER.info("loginDetails {}", loginDetails);
 		LOGGER.info("brand" + brand);
 		LOGGER.info("month {}", month);
 							currentMonthEnd)
 					.stream().collect(Collectors.toMap(x -> x.getBrand(), x -> x.getAmount()));
+		}
 		LOGGER.info("partnerType {}", partnerType);
 		LOGGER.info("categoryUpradeBrandModelMap {}", categoryUpradeBrandModelMap);
-		    lastMonthModelWiseIncomes = schemeInOutRepository.selectLastMonthBrandWiseIncome(loginDetails.getFofoId(),
+		lastMonthModelWiseIncomes = schemeInOutRepository.selectLastMonthBrandWiseIncome(loginDetails.getFofoId(),
-					brand, lastMonthStart, currentMonthEnd);
+				brand, lastMonthStart, currentMonthEnd);
-			modelWiseFrontIncomes = schemeInOutRepository.selectFrontIncomeBrandWise(loginDetails.getFofoId(), brand,
+		modelWiseFrontIncomes = schemeInOutRepository.selectFrontIncomeBrandWise(loginDetails.getFofoId(), brand,
-					lastMonthStart, currentMonthEnd);
+				lastMonthStart, currentMonthEnd);
-			purchaseInModelWiseIncomes = schemeInOutRepository.selectLastMonthPurchaseBrandWiseIncome(
+		purchaseInModelWiseIncomes = schemeInOutRepository.selectLastMonthPurchaseBrandWiseIncome(
-					loginDetails.getFofoId(), brand, lastMonthStart, currentMonthEnd);
+				loginDetails.getFofoId(), brand, lastMonthStart, currentMonthEnd);
-			LOGGER.info("modelWiseFrontIncomes {}", modelWiseFrontIncomes);
+		LOGGER.info("modelWiseFrontIncomes {}", modelWiseFrontIncomes);
-			LOGGER.info("lastMonthModelWiseIncomes {}", lastMonthModelWiseIncomes);
+		LOGGER.info("lastMonthModelWiseIncomes {}", lastMonthModelWiseIncomes);
-			LOGGER.info("purchaseInModelWiseIncomes {}", purchaseInModelWiseIncomes);
+		LOGGER.info("purchaseInModelWiseIncomes {}", purchaseInModelWiseIncomes);
-			Map<String, LastMonthBrandWiseIncomeModel> modelWiseMap = lastMonthModelWiseIncomes.stream()
+		Map<String, LastMonthBrandWiseIncomeModel> modelWiseMap = lastMonthModelWiseIncomes.stream()
-					.collect(Collectors.toMap(x -> x.getModelNumber(), x -> x));
+				.collect(Collectors.toMap(x -> x.getModelNumber(), x -> x));
-			LOGGER.info("modelWiseMap1" + modelWiseMap );
+		LOGGER.info("modelWiseMap1" + modelWiseMap);
-			Map<String, LastMonthBrandWiseIncomeModel> purchaseWiseMap = purchaseInModelWiseIncomes.stream()
+		Map<String, LastMonthBrandWiseIncomeModel> purchaseWiseMap = purchaseInModelWiseIncomes.stream()
-					.collect(Collectors.toMap(x -> x.getModelNumber(), x -> x));
+				.collect(Collectors.toMap(x -> x.getModelNumber(), x -> x));
 		Map<String, Double> modelWiseTotalAmount = new HashMap<>();
 		modelWiseFrontIncomes.stream().forEach(x -> {
-			LastMonthBrandWiseIncomeModel lmbwi =	modelWiseMap.get(x.getModelNumber());
+			LastMonthBrandWiseIncomeModel lmbwi = modelWiseMap.get(x.getModelNumber());
 			if (modelWiseMap.containsKey(x.getModelNumber())) {
 				lmbwi.setAmount(x.getAmount() + lmbwi.getAmount());
 				modelWiseMap.put(x.getModelNumber(), lmbwi);
-			}
-			else {
+			} else {
 				LastMonthBrandWiseIncomeModel lmbwIncomeModel = new LastMonthBrandWiseIncomeModel();
 				lmbwIncomeModel.setAmount(x.getAmount());
 				lmbwIncomeModel.setModelName(x.getModelName());
 				lmbwIncomeModel.setModelNumber(x.getModelNumber());
 				lmbwIncomeModel.setBrand(x.getBrand());
 				lmbwIncomeModel.setPendingSaleAmount(x.getPendingSaleAmount());
 				lmbwIncomeModel.setQty(x.getQty());
 				lmbwIncomeModel.setStatus(SchemePayoutStatus.CREDITED);
 				modelWiseMap.put(lmbwIncomeModel.getModelNumber(), lmbwIncomeModel);
+			}
 			if (modelWiseTotalAmount.containsKey(x.getModelNumber())) {
 				double amount = x.getAmount() + modelWiseTotalAmount.get(x.getModelNumber());
 				modelWiseTotalAmount.put(x.getModelNumber(), amount);
 			} else {
 				double amount = modelWiseMap.get(x.getModelNumber()).getAmount();
 				modelWiseTotalAmount.put(x.getModelNumber(), amount);
+			}
-         });
+		});
 		for (LastMonthBrandWiseIncomeModel pmi : purchaseInModelWiseIncomes) {
 			if (!modelWiseMap.containsKey(pmi.getModelNumber())) {
 				modelWiseMap.put(pmi.getModelNumber(), null);
+			}
 			} else {
 				modelWiseTotalAmount.put(pmi.getModelNumber(), pmi.getAmount());
+			}
+		}
-		LOGGER.info("modelWiseTotalAmount" + modelWiseTotalAmount );
+		LOGGER.info("modelWiseTotalAmount" + modelWiseTotalAmount);
-		lastMonthModelWiseIncomes.stream().filter(x->x.getStatus().equals(SchemePayoutStatus.PENDING) && x.getPendingSaleAmount() != 0.0).forEach(x-> {
+		lastMonthModelWiseIncomes.stream().filter(x -> x.getStatus().equals(SchemePayoutStatus.PENDING) && x.getPendingSaleAmount() != 0.0).forEach(x -> {
-			if(modelWiseTotalAmount.containsKey(x.getModelNumber()))
+			if (modelWiseTotalAmount.containsKey(x.getModelNumber())) {
-			{
-				double amount = 	modelWiseTotalAmount.get(x.getModelNumber()) + x.getPendingSaleAmount();
+				double amount = modelWiseTotalAmount.get(x.getModelNumber()) + x.getPendingSaleAmount();
 				modelWiseTotalAmount.put(x.getModelNumber(), amount);
-				LOGGER.info("modelWiseTotalAmoun111t" + amount );
+				LOGGER.info("modelWiseTotalAmoun111t" + amount);
-			}
-			else {
+			} else {
-				LOGGER.info("modelWiseTotalAmou2222t" + x.getPendingSaleAmount() );
+				LOGGER.info("modelWiseTotalAmou2222t" + x.getPendingSaleAmount());
 				modelWiseTotalAmount.put(x.getModelNumber(), x.getPendingSaleAmount());
+			}
 		});
-		LOGGER.info("modelWiseMap" + modelWiseMap );
+		LOGGER.info("modelWiseMap" + modelWiseMap);
-			model.addAttribute("purchaseWiseMap", purchaseWiseMap);
+		model.addAttribute("purchaseWiseMap", purchaseWiseMap);
-			model.addAttribute("categoryUpradeBrandModelMap", categoryUpradeBrandModelMap);
+		model.addAttribute("categoryUpradeBrandModelMap", categoryUpradeBrandModelMap);
-			model.addAttribute("modelWiseMap", modelWiseMap);
+		model.addAttribute("modelWiseMap", modelWiseMap);
-			model.addAttribute("modelWiseTotalAmount", modelWiseTotalAmount);
+		model.addAttribute("modelWiseTotalAmount", modelWiseTotalAmount);
 		return "montly-brand-wise-income";
+	}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java – Rev 30235 → 30253