Subversion Repositories SmartDukaan

Rev

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

Rev 29707 Rev 29720
Line 67... Line 67...
67 
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
 67 
import com.spice.profitmandi.dao.entity.fofo.FofoOrderItem;
68 
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
 68 
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
69 
import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
 69 
import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
70 
import com.spice.profitmandi.dao.entity.fofo.PartnerType;
 70 
import com.spice.profitmandi.dao.entity.fofo.PartnerType;
71 
import com.spice.profitmandi.dao.entity.inventory.ReporticoCacheTable;
 71 
import com.spice.profitmandi.dao.entity.inventory.ReporticoCacheTable;
- 
 
 72 
import com.spice.profitmandi.dao.entity.transaction.LineItem;
72 
import com.spice.profitmandi.dao.entity.transaction.Order;
 73 
import com.spice.profitmandi.dao.entity.transaction.Order;
73 
import com.spice.profitmandi.dao.enumuration.catalog.UpgradeOfferStatus;
 74 
import com.spice.profitmandi.dao.enumuration.catalog.UpgradeOfferStatus;
74 
import com.spice.profitmandi.dao.enumuration.transaction.OrderStatus;
 75 
import com.spice.profitmandi.dao.enumuration.transaction.OrderStatus;
75 
import com.spice.profitmandi.dao.model.ActivationBrandModel;
 76 
import com.spice.profitmandi.dao.model.ActivationBrandModel;
76 
import com.spice.profitmandi.dao.model.ActivationImeiUpdationModel;
 77 
import com.spice.profitmandi.dao.model.ActivationImeiUpdationModel;
Line 124... Line 125...
124 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderItemRepository;
 125 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderItemRepository;
125 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderRepository;
 126 
import com.spice.profitmandi.dao.repository.fofo.PendingOrderRepository;
126 
import com.spice.profitmandi.dao.repository.fofo.SchemeInOutRepository;
 127 
import com.spice.profitmandi.dao.repository.fofo.SchemeInOutRepository;
127 
import com.spice.profitmandi.dao.repository.inventory.ReporticoCacheTableRepository;
 128 
import com.spice.profitmandi.dao.repository.inventory.ReporticoCacheTableRepository;
128 
import com.spice.profitmandi.dao.repository.inventory.SaholicInventoryCISRepository;
 129 
import com.spice.profitmandi.dao.repository.inventory.SaholicInventoryCISRepository;
- 
 
 130 
import com.spice.profitmandi.dao.repository.transaction.LineItemRepository;
129 
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
 131 
import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
130 
import com.spice.profitmandi.dao.repository.transaction.PriceDropRepository;
 132 
import com.spice.profitmandi.dao.repository.transaction.PriceDropRepository;
131 
import com.spice.profitmandi.service.AdminUser;
 133 
import com.spice.profitmandi.service.AdminUser;
132 
import com.spice.profitmandi.service.FofoUser;
 134 
import com.spice.profitmandi.service.FofoUser;
133 
import com.spice.profitmandi.service.PartnerInvestmentService;
 135 
import com.spice.profitmandi.service.PartnerInvestmentService;
Line 185... Line 187...
185 
	@Autowired
 187 
	@Autowired
186 
	private AdminUser adminUser;
 188 
	private AdminUser adminUser;
187 
 
 189 
 
188 
	@Autowired
 190 
	@Autowired
189 
	private RoleManager roleManager;
 191 
	private RoleManager roleManager;
- 
 
 192
190 
 
 193 
 
191 
	@Autowired
 194 
	@Autowired
192 
	private FofoStoreRepository fofoStoreRepository;
 195 
	private FofoStoreRepository fofoStoreRepository;
193 
 
 196 
 
194 
	@Autowired
 197 
	@Autowired
Line 263... Line 266...
263 
	@Autowired
 266 
	@Autowired
264 
	private OrderRepository orderRepository;
 267 
	private OrderRepository orderRepository;
265 
 
 268 
 
266 
	@Autowired
 269 
	@Autowired
267 
	private FofoUser fofoUser;
 270 
	private FofoUser fofoUser;
268 
 
 271
269 
	@Autowired
 272 
	@Autowired
270 
	private ActivatedImeiRepository activatedImeiRepository;
 273 
	private ActivatedImeiRepository activatedImeiRepository;
271 
 
 274 
 
272 
	@Autowired
 275 
	@Autowired
273 
	private Mongo mongoClient;
 276 
	private Mongo mongoClient;
274 
 
 277 
 
275 
	@Autowired
 278 
	@Autowired
276 
	private SchemeInOutRepository schemeInOutRepository;
 279 
	private SchemeInOutRepository schemeInOutRepository;
- 
 
 280
- 
 
 281 
	@Autowired
- 
 
 282 
	private LineItemRepository lineItemRepository;
277 
 
 283
278 
	@Autowired
 284 
	@Autowired
279 
	private FofoLineItemRepository fofoLineItemRepository;
 285 
	private FofoLineItemRepository fofoLineItemRepository;
280 
 
 286 
 
281 
	@Autowired
 287 
	@Autowired
282 
	private PositionRepository positionRepository;
 288 
	private PositionRepository positionRepository;
Line 362... Line 368...
362 
			ms.setMtdSales(fofoUser.format((long) mtdSales));
 368 
			ms.setMtdSales(fofoUser.format((long) mtdSales));
363 
			ms.setMonthlySales(fofoUser.format(((long) monthSales)));
 369 
			ms.setMonthlySales(fofoUser.format(((long) monthSales)));
364 
			ms.setPartnerType(partnerType);
 370 
			ms.setPartnerType(partnerType);
365 
			ms.setMonth(startOfMonth.format(DateTimeFormatter.ofPattern("MMM''uu")));
 371 
			ms.setMonth(startOfMonth.format(DateTimeFormatter.ofPattern("MMM''uu")));
366 
			monthSaleMap.put(i, ms);
 372 
			monthSaleMap.put(i, ms);
367 
 
 - 
 
368 
		}
 373 
       }
369 
 
 374 
 
370 
		model.addAttribute("monthSales", monthSaleMap);
 375 
		model.addAttribute("monthSales", monthSaleMap);
371 
		return "monthSales";
 376 
		return "monthSales";
372 
	}
 377 
	}
373 
 
 378 
 
Line 377... Line 382...
377 
		String email = loginDetails.getEmailId();
 382 
		String email = loginDetails.getEmailId();
378 
		int fofoId = loginDetails.getFofoId();
 383 
		int fofoId = loginDetails.getFofoId();
379 
 
 384 
 
380 
		LocalDateTime startDate = LocalDate.now().withDayOfYear(1).atStartOfDay();
 385 
		LocalDateTime startDate = LocalDate.now().withDayOfYear(1).atStartOfDay();
381 
		LocalDateTime endtDate = LocalDateTime.now();
 386 
		LocalDateTime endtDate = LocalDateTime.now();
382 
		OnlineDeliveredOrderSum onlineDeliveredOrderSum = pendingOrderItemRepository
 387 
		OnlineDeliveredOrderSum onlineDeliveredOrderSum = pendingOrderItemRepository.selectSumSellingPriceOnlineOrder(fofoId, startDate, endtDate);
383 
				.selectSumSellingPriceOnlineOrder(fofoId, startDate, endtDate);
 - 
 
384 
 
 - 
 
385 
		LOGGER.info("onlineDeliveredOrderSum" + onlineDeliveredOrderSum.getSellingPrice());
 388 
    	LOGGER.info("onlineDeliveredOrderSum" + onlineDeliveredOrderSum.getSellingPrice());
386 
 
 389 
 
387 
		long countOrder = pendingOrderRepository.pendingOrderCount(fofoId, OrderStatus.PROCESSING);
 390 
		long countOrder = pendingOrderRepository.pendingOrderCount(fofoId, OrderStatus.PROCESSING);
388 
		LOGGER.info("countOrder" + countOrder);
 391 
		LOGGER.info("countOrder" + countOrder);
- 
 
 392
- 
 
 393 
		ArrayList<in.shop2020.model.v1.order.OrderStatus> orderStatus = new ArrayList<>();
- 
 
 394
- 
 
 395 
		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.SUBMITTED_FOR_PROCESSING);
- 
 
 396 
		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.BILLED);
- 
 
 397 
		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH);
- 
 
 398
- 
 
 399
- 
 
 400 
		List<Order> order =orderRepository.selectOrders(fofoId,orderStatus);
- 
 
 401 
	    List<Integer>	submittedOrderIds = order.stream().filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.SUBMITTED_FOR_PROCESSING).map(x -> x.getId()).collect(Collectors.toList());
- 
 
 402 
	    List<Integer>	billedOrderIds = order.stream().filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.BILLED).map(x -> x.getId()).collect(Collectors.toList());
- 
 
 403 
	    List<Integer>	shippedOrderIds = order.stream().filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH).map(x -> x.getId()).collect(Collectors.toList());
- 
 
 404
- 
 
 405 
	    LOGGER.info("billedOrderIds {}", billedOrderIds);
- 
 
 406 
	    LOGGER.info("shippedOrderIds {}", shippedOrderIds);
- 
 
 407
- 
 
 408
- 
 
 409 
	    List<Order> grnPendingOrder =orderRepository.selectPendingGrnOrders(fofoId);
- 
 
 410 
	    List<Integer>	grnOrderIds = grnPendingOrder.stream().map(x -> x.getId()).collect(Collectors.toList());
- 
 
 411 
	    model.addAttribute("grnOrderIds", grnOrderIds);
- 
 
 412 
	    if(!grnOrderIds.isEmpty()) {
- 
 
 413
- 
 
 414 
	    List<LineItem>  grnPendingLineItem = lineItemRepository.selectLineItem(grnOrderIds);
- 
 
 415 
	    Map<Integer, LineItem> grnPendingLineMap = grnPendingLineItem.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
- 
 
 416
- 
 
 417
- 
 
 418 
	    long grnPendingCount = grnPendingLineMap.entrySet().stream().filter(x -> x.getKey() > 0 ).count();
- 
 
 419 
		   long grnPendingValue = grnPendingLineMap.entrySet().stream().mapToLong(x -> x.getValue().getTotalPrice().longValue()).sum();
- 
 
 420 
		   model.addAttribute("grnPendingCount", grnPendingCount);
- 
 
 421 
		   model.addAttribute("grnPendingValue", grnPendingValue);
- 
 
 422
- 
 
 423
- 
 
 424 
	    }
- 
 
 425
- 
 
 426 
	    if(!submittedOrderIds.isEmpty()) {
- 
 
 427
- 
 
 428 
	    List<LineItem>  submittedLineItem = lineItemRepository.selectLineItem(submittedOrderIds);
- 
 
 429 
	    Map<Integer, LineItem> submittedLineItemMap = submittedLineItem.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
- 
 
 430 
	    LOGGER.info("submittedLineItemMap {}", submittedLineItemMap);
- 
 
 431
- 
 
 432 
	   long submittedCount = submittedLineItemMap.entrySet().stream().filter(x -> x.getKey() > 0 ).count();
- 
 
 433 
	   long submittedValue = submittedLineItemMap.entrySet().stream().mapToLong(x -> x.getValue().getTotalPrice().longValue()).sum();
- 
 
 434 
	   model.addAttribute("submittedCount", submittedCount);
- 
 
 435 
	   model.addAttribute("submittedValue", submittedValue);
- 
 
 436 
	   LOGGER.info("submittedCount {}", submittedCount);
- 
 
 437 
	    }
- 
 
 438 
	    if(!billedOrderIds.isEmpty()) {
- 
 
 439 
	    List<LineItem>  billedLineItem = lineItemRepository.selectLineItem(billedOrderIds);
- 
 
 440 
	    Map<Integer, LineItem> billedLineItemMap = billedLineItem.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
- 
 
 441 
	    LOGGER.info("billedLineItemMap {}", billedLineItemMap);
- 
 
 442 
	    long billedCount = billedLineItemMap.entrySet().stream().filter(x -> x.getKey() > 0 ).count();
- 
 
 443 
		   model.addAttribute("billedCount", billedCount);
- 
 
 444 
		   LOGGER.info("billedCount {}", billedCount);
- 
 
 445
- 
 
 446 
		   long billedValue = billedLineItemMap.entrySet().stream().mapToLong(x -> x.getValue().getTotalPrice().longValue()).sum();
- 
 
 447 
		   model.addAttribute("billedValue", billedValue);
- 
 
 448 
	    }
- 
 
 449
- 
 
 450 
	    if(!shippedOrderIds.isEmpty()) {
- 
 
 451 
	    List<LineItem>  shippedLineItem = lineItemRepository.selectLineItem(shippedOrderIds);
- 
 
 452 
	    Map<Integer, LineItem> shippedLineItemMap = shippedLineItem.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
- 
 
 453 
	    LOGGER.info("shippedLineItemMap {}", shippedLineItemMap);
- 
 
 454
- 
 
 455 
	    long shippedCount = shippedLineItemMap.entrySet().stream().filter(x -> x.getKey() > 0 ).count();
- 
 
 456 
		   model.addAttribute("shippedCount", shippedCount);
- 
 
 457 
		   LOGGER.info("shippedCount {}", shippedCount);
- 
 
 458
- 
 
 459 
		   long shippedValue = shippedLineItemMap.entrySet().stream().mapToLong(x -> x.getValue().getTotalPrice().longValue()).sum();
- 
 
 460 
		   model.addAttribute("shippedValue", shippedValue);
- 
 
 461 
	    }
- 
 
 462
- 
 
 463
- 
 
 464
389 
 
 465
390 
		model.addAttribute("countOrder", countOrder);
 466 
		model.addAttribute("countOrder", countOrder);
391 
		model.addAttribute("onlineDeliveredOrderSum", onlineDeliveredOrderSum.getSellingPrice());
 467 
		model.addAttribute("onlineDeliveredOrderSum", onlineDeliveredOrderSum.getSellingPrice());
392 
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
 468 
		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
393 
		model.addAttribute("isAdmin", isAdmin);
 469 
		model.addAttribute("isAdmin", isAdmin);
394 
 
 470 
 
Line 489... Line 565...
489 
		 */
 565 
		 */
490 
 
 566 
 
491 
		return "dashboard1";
 567 
		return "dashboard1";
492 
 
 568 
 
493 
	}
 569 
	}
- 
 
 570
- 
 
 571 
	@RequestMapping(value = "/getGrnPendingOrderStatus", method = RequestMethod.GET)
- 
 
 572 
	public String getGrnPendingOrderStatus(HttpServletRequest request, Model model) throws Exception {
- 
 
 573
- 
 
 574
- 
 
 575 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
- 
 
 576 
		int fofoId = loginDetails.getFofoId();
- 
 
 577 
        ArrayList<in.shop2020.model.v1.order.OrderStatus> orderStatus = new ArrayList<>();
- 
 
 578
- 
 
 579 
		List<Order> order =orderRepository.selectPendingGrnOrders(fofoId);
- 
 
 580 
	    List<Integer>	grnOrderIds = order.stream().map(x -> x.getId()).collect(Collectors.toList());
- 
 
 581 
	    model.addAttribute("grnOrderIds", grnOrderIds);
- 
 
 582 
	    if(!grnOrderIds.isEmpty()) {
- 
 
 583
- 
 
 584 
	    List<LineItem>  grnPendingLineItem = lineItemRepository.selectLineItem(grnOrderIds);
- 
 
 585 
	    Map<Integer, LineItem> grnPendingLineMap = grnPendingLineItem.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
- 
 
 586 
	    LOGGER.info("grnPendingLineMap {}", grnPendingLineMap);
- 
 
 587 
	    model.addAttribute("grnPendingLineMap", grnPendingLineMap);
- 
 
 588
- 
 
 589 
	    }
- 
 
 590
- 
 
 591 
		return "purchase-grn-order-status";
- 
 
 592 
	}
- 
 
 593
- 
 
 594 
	@RequestMapping(value = "/getPendingOrderStatus", method = RequestMethod.GET)
- 
 
 595 
	public String getPendingOrderStatus(HttpServletRequest request, Model model) throws Exception {
- 
 
 596
- 
 
 597
- 
 
 598 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
- 
 
 599 
		int fofoId = loginDetails.getFofoId();
- 
 
 600 
        ArrayList<in.shop2020.model.v1.order.OrderStatus> orderStatus = new ArrayList<>();
- 
 
 601
- 
 
 602 
		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.SUBMITTED_FOR_PROCESSING);
- 
 
 603
- 
 
 604
- 
 
 605 
		List<Order> order =orderRepository.selectOrders(fofoId,orderStatus);
- 
 
 606 
	    List<Integer>	submittedOrderIds = order.stream().filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.SUBMITTED_FOR_PROCESSING).map(x -> x.getId()).collect(Collectors.toList());
- 
 
 607 
	    model.addAttribute("submittedOrderIds", submittedOrderIds);
- 
 
 608 
	    if(!submittedOrderIds.isEmpty()) {
- 
 
 609
- 
 
 610 
	    List<LineItem>  submittedLineItem = lineItemRepository.selectLineItem(submittedOrderIds);
- 
 
 611 
	    Map<Integer, LineItem> submittedLineItemMap = submittedLineItem.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
- 
 
 612 
	    LOGGER.info("submittedLineItemMap {}", submittedLineItemMap);
- 
 
 613 
	    model.addAttribute("submittedLineItemMap", submittedLineItemMap);
- 
 
 614 
		    }
- 
 
 615
- 
 
 616 
		return "purchase-pending-order-status";
- 
 
 617 
	}
- 
 
 618
- 
 
 619 
	@RequestMapping(value = "/getBilledOrderStatus", method = RequestMethod.GET)
- 
 
 620 
	public String getBilledOrderStatus(HttpServletRequest request, Model model) throws Exception {
- 
 
 621
- 
 
 622
- 
 
 623 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
- 
 
 624 
		int fofoId = loginDetails.getFofoId();
- 
 
 625 
        ArrayList<in.shop2020.model.v1.order.OrderStatus> orderStatus = new ArrayList<>();
- 
 
 626 
		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.BILLED);
- 
 
 627
- 
 
 628 
		List<Order> order =orderRepository.selectOrders(fofoId,orderStatus);
- 
 
 629 
	    	    List<Integer>	billedOrderIds = order.stream().filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.BILLED).map(x -> x.getId()).collect(Collectors.toList());
- 
 
 630 
	     LOGGER.info("billedOrderIds {}", billedOrderIds);
- 
 
 631 
	 	    model.addAttribute("billedOrderIds", billedOrderIds);
- 
 
 632
- 
 
 633 
	    if(!billedOrderIds.isEmpty()) {
- 
 
 634 
	    List<LineItem>  billedLineItem = lineItemRepository.selectLineItem(billedOrderIds);
- 
 
 635 
	    Map<Integer, LineItem> billedLineItemMap = billedLineItem.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
- 
 
 636 
	    LOGGER.info("billedLineItemMap {}", billedLineItemMap);
- 
 
 637 
	    model.addAttribute("billedLineItemMap", billedLineItemMap);
- 
 
 638 
	    }
- 
 
 639
- 
 
 640 
		return "purchase-billed-order-status";
- 
 
 641 
	}
- 
 
 642 
	@RequestMapping(value = "/getShippedOrderStatus", method = RequestMethod.GET)
- 
 
 643 
	public String getShippedOrderStatus(HttpServletRequest request, Model model) throws Exception {
- 
 
 644
- 
 
 645
- 
 
 646 
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
- 
 
 647 
		int fofoId = loginDetails.getFofoId();
- 
 
 648 
        ArrayList<in.shop2020.model.v1.order.OrderStatus> orderStatus = new ArrayList<>();
- 
 
 649
- 
 
 650 
		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH);
- 
 
 651
- 
 
 652
- 
 
 653 
		List<Order> order =orderRepository.selectOrders(fofoId,orderStatus);
- 
 
 654 
	   	    List<Integer>	shippedOrderIds = order.stream().filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH).map(x -> x.getId()).collect(Collectors.toList());
- 
 
 655 
	    	  	    model.addAttribute("shippedOrderIds", shippedOrderIds);
- 
 
 656 
	    LOGGER.info("shippedOrderIds {}", shippedOrderIds);
- 
 
 657
- 
 
 658
- 
 
 659 
	    if(!shippedOrderIds.isEmpty()) {
- 
 
 660 
	    List<LineItem>  shippedLineItem = lineItemRepository.selectLineItem(shippedOrderIds);
- 
 
 661 
	    Map<Integer, LineItem> shippedLineItemMap = shippedLineItem.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
- 
 
 662 
	    LOGGER.info("shippedLineItemMap {}", shippedLineItemMap);
- 
 
 663
- 
 
 664 
	    model.addAttribute("shippedLineItemMap", shippedLineItemMap);
- 
 
 665 
	    }
- 
 
 666 
		return "purchase-shipped-order-status";
- 
 
 667 
	}
494 
 
 668 
 
495 
	@RequestMapping(value = "/getMonthsInvestment", method = RequestMethod.GET)
 669 
	@RequestMapping(value = "/getMonthsInvestment", method = RequestMethod.GET)
496 
	public String getMonthsInvestment(HttpServletRequest request,
 670 
	public String getMonthsInvestment(HttpServletRequest request,
497 
			@RequestParam(name = "month", required = true, defaultValue = "0") int month, Model model)
 671 
			@RequestParam(name = "month", required = true, defaultValue = "0") int month, Model model)
498 
			throws Exception {
 672 
			throws Exception {
Line 655... Line 829...
655 
 
 829 
 
656 
		Map<String, Double> priceDropBrandSixMonthMap = priceDropBrandSixMonthTotals.stream()
 830 
		Map<String, Double> priceDropBrandSixMonthMap = priceDropBrandSixMonthTotals.stream()
657 
				.collect(Collectors.toMap(x -> x.getBrand(), x -> (double) x.getAmount()));
 831 
				.collect(Collectors.toMap(x -> x.getBrand(), x -> (double) x.getAmount()));
658 
 
 832 
 
659 
		model.addAttribute("priceDropBrandSixMonthMap", priceDropBrandSixMonthMap);
 833 
		model.addAttribute("priceDropBrandSixMonthMap", priceDropBrandSixMonthMap);
660 
 
 - 
 
661 
		LOGGER.info("priceDropYearMonthModels" + priceDropYearMonthModels);
 834 
		LOGGER.info("priceDropYearMonthModels" + priceDropYearMonthModels);
662 
 
 835 
 
663 
		for (PriceDropYearMonthModel pdm : priceDropYearMonthModels) {
 836 
		for (PriceDropYearMonthModel pdm : priceDropYearMonthModels) {
664 
			Map<YearMonth, Double> brandValue = new HashMap<>();
 837 
			Map<YearMonth, Double> brandValue = new HashMap<>();
665 
 
 838