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

+	}
 	private Map<String, Object> getSales(int fofoId) {
 		Map<String, Object> salesMap = new LinkedHashMap<>();
+		LocalDateTime now = LocalDateTime.now();
-		LocalDateTime curDate = LocalDate.now().atStartOfDay();
+		LocalDateTime startOfToday= LocalDate.now().atStartOfDay();
 		int monthLength = LocalDate.now().lengthOfMonth();
+		int daysGone = now.getDayOfMonth() - 1;
+		int daysRemaining = monthLength - daysGone;
 		Double todaySale = fofoOrderItemRepository
-				.selectSumMopGroupByRetailer(curDate, curDate.with(LocalTime.MAX), fofoId, false).get(fofoId);
+				.selectSumMopGroupByRetailer(startOfToday, now, fofoId, false).get(fofoId);
-		Double mtdSale = fofoOrderItemRepository
+		Double mtdSaleTillYesterDay = fofoOrderItemRepository
-				.selectSumMopGroupByRetailer(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX), fofoId, false)
+				.selectSumMopGroupByRetailer(startOfToday.withDayOfMonth(1), startOfToday, fofoId, false)
 				.get(fofoId);
+		Double mtdSale = mtdSaleTillYesterDay + todaySale;
-		Double lmtdSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate.withDayOfMonth(1).minusMonths(1),
+		Double lmtdSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(startOfToday.withDayOfMonth(1).minusMonths(1),
-				curDate.with(LocalTime.MAX).minusMonths(1), fofoId, false).get(fofoId);
+				now.minusMonths(1), fofoId, false).get(fofoId);
 		List<PartnerTargetDetails> partnerTargetDetails = partnerTargetRepository
 				.selectAllGeEqAndLeEqStartDateAndEndDate(LocalDateTime.now());
 		if (partnerTargetDetails.isEmpty()) {
 			partnerTargetDetails = partnerTargetRepository
 					.selectAllGeEqAndLeEqStartDateAndEndDate(LocalDateTime.now().minusMonths(3));
+		}
 		PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoId, LocalDate.now());
+		int currentRate = 0;
+		if(mtdSaleTillYesterDay> 0) {
-		int currentRate = (int) (mtdSale / curDate.getDayOfMonth());
+			currentRate = (int) (mtdSaleTillYesterDay / daysGone);
+		}
 		salesMap.put("requiredType", partnerType.next());
 		float reqdAmount = partnerTypeChangeService.getMinimumAmount(partnerType.next());
-		int requiredRate = (int) ((reqdAmount - mtdSale) / (monthLength - curDate.getDayOfMonth()));
+		int requiredRate = (int) ((reqdAmount - mtdSaleTillYesterDay) / daysRemaining);
 		if (partnerType.equals(PartnerType.PLATINUM) && requiredRate < currentRate) {
 			requiredRate = currentRate;
+		}
 		salesMap.put("requiredRate", requiredRate);
 		salesMap.put("requiredTypeImage", PartnerType.imageMap.get(partnerType.next()));
 						.map(x -> retailerService.getAllFofoRetailers().get(x)).filter(x -> x != null)
 						.collect(Collectors.toSet());
 				model.addAttribute("retailers", gson.toJson(positionRetailers));
 				model.addAttribute("reporticoProjectMap", ReporticoProject.salesReporticoProjectMap);
 				model.addAttribute("warehouses", getWarehouses(positionRetailers));
+			} else {
+				List<Position> warehousePositions = positions.stream()
+						.filter(x -> x.getCategoryId() == ProfitMandiConstants.TICKET_CATEGORY_WAREHOUSE)
+						.collect(Collectors.toList());
+				if (warehousePositions.size() > 0) {
+					Set<CustomRetailer> positionRetailers = new HashSet<>();
+					csService.getPositionCustomRetailerMap(warehousePositions).values().forEach(customRetailers -> {
+						positionRetailers.addAll(customRetailers);
+					});
+					model.addAttribute("reporticoProjectMap", ReporticoProject.warehouseReporticoMap);
+					model.addAttribute("retailers", gson.toJson(positionRetailers));
+					model.addAttribute("warehouses", getWarehouses(positionRetailers));
+				}
+			}
 			if (positions.size() > 0) {
 				if (positions.stream()
 						.filter(x -> x.getEscalationType().equals(EscalationType.L3)
 					authUserTicketCount = ticketRepository.selectAllAuthUserTicketCount(Optional.of(false));
+				}
+			}
 			if (Arrays.asList("amit.gupta@shop2020.in", "tejbeer.kaur@shop2020.in", "manish.tiwari@smartdukaan.com")
-					.contains(email))
+					.contains(email)) {
-			{
 				menus = menuRepository.selectAll();
 			} else if (positions.size() > 0) {
 				if (positions.stream().filter(x -> x.getEscalationType().equals(EscalationType.L5)).count() > 0) {
 					menus = menuRepository.selectAll();
 				} else {
 					if (menuIds.size() > 0) {
 						menus = menuRepository.selectAllByIds(menuIds);
+					}
+				}
+			}
-			/*
-			 * List<Position> salesPositions = positions.stream() .filter(x ->
-			 * x.getCategoryId() == ProfitMandiConstants.TICKET_CATEGORY_SALES)
-			 * .collect(Collectors.toList()); if (salesPositions.size() > 0) {
-			 * Set<CustomRetailer> positionRetailers = new HashSet<>();
-			 * csService.getPositionCustomRetailerMap(salesPositions).values().forEach(
-			 * customRetailers -> { positionRetailers.addAll(customRetailers); }); }
-			 */
-			if (fofoIds == null) {
-				List<Position> warehousePositions = positions.stream()
-						.filter(x -> x.getCategoryId() == ProfitMandiConstants.TICKET_CATEGORY_WAREHOUSE)
-						.collect(Collectors.toList());
-				if (warehousePositions.size() > 0) {
-					Set<CustomRetailer> positionRetailers = new HashSet<>();
-					csService.getPositionCustomRetailerMap(warehousePositions).values().forEach(customRetailers -> {
-						positionRetailers.addAll(customRetailers);
-					});
-					model.addAttribute("reporticoProjectMap", ReporticoProject.warehouseReporticoMap);
-					model.addAttribute("retailers", gson.toJson(positionRetailers));
-					model.addAttribute("warehouses", getWarehouses(positionRetailers));
-				}
-			}
 			model.addAttribute("authId", authUser.getId());
 			model.addAttribute("rctPartneStat", rctPartneStat);
 			model.addAttribute("reporticoDate", rctSaholic);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java – Rev 28439 → 28442