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



		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH);
		orderStatus.add(in.shop2020.model.v1.order.OrderStatus.DELIVERY_SUCCESS);
 
		List<Order> order = orderRepository.selectGrnTimestampNull(fofoId, orderStatus);
		List<LineItem> submittedLineItemIds = order.stream()
				.filter(x -> x.getStatus().equals(in.shop2020.model.v1.order.OrderStatus.SUBMITTED_FOR_PROCESSING))
				.map(x -> x.getLineItem()).collect(Collectors.toList());
		List<LineItem> billedOrderIds = order.stream()
				.filter(x -> x.getStatus().equals(in.shop2020.model.v1.order.OrderStatus.BILLED))
				.map(x -> x.getLineItem()).collect(Collectors.toList());
		List<LineItem> shippedOrderIds = order.stream()
				.filter(x -> x.getStatus().equals(in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH))
				.map(x -> x.getLineItem()).collect(Collectors.toList());
		List<LineItem> grnPendingLineItemIds = order.stream()
				.filter(x -> x.getStatus().equals(in.shop2020.model.v1.order.OrderStatus.DELIVERY_SUCCESS))
				.map(x -> x.getLineItem()).collect(Collectors.toList());
 
		LOGGER.info("billedOrderIds {}", billedOrderIds);
		LOGGER.info("shippedOrderIds {}", shippedOrderIds);
 

			try {
				fofoStore = fofoStoreRepository.selectByRetailerId(loginDetails.getFofoId());
				if (!fofoStore.isActive()) {
					return "redirect:/login";
				}
 
				PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoStore.getId(), LocalDate.now());
				model.addAttribute("partnerType", partnerType);
				model.addAttribute("partnerTypeImage", PartnerType.imageMap.get(partnerType));
				model.addAttribute("fofoStore", fofoStore);
				model.addAttribute("partnerType", partnerType);

		return "activation-brandwise-report";
	}
 
	@RequestMapping(value = "/getWarehouseBrandWiseItemActivatedModel", method = RequestMethod.GET)
	public String getWarehouseBrandWiseItemActivatedModel(HttpServletRequest request, Model model,
			@RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {
		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
		List<Integer> fofoIds = getFofoIds(loginDetails);
 
		Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
		List<WarehouseBrandWiseItemActivatedModel> activatedItems = activatedImeiRepository

Subversion Repositories SmartDukaan

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

Rev 30279		Rev 30346
Line 331...		Line 331...
331	`orderStatus.add(in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH);`	331	`orderStatus.add(in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH);`
332	`orderStatus.add(in.shop2020.model.v1.order.OrderStatus.DELIVERY_SUCCESS);`	332	`orderStatus.add(in.shop2020.model.v1.order.OrderStatus.DELIVERY_SUCCESS);`
333		333
334	`List<Order> order = orderRepository.selectGrnTimestampNull(fofoId, orderStatus);`	334	`List<Order> order = orderRepository.selectGrnTimestampNull(fofoId, orderStatus);`
335	`List<LineItem> submittedLineItemIds = order.stream()`	335	`List<LineItem> submittedLineItemIds = order.stream()`
336	`.filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.SUBMITTED_FOR_PROCESSING)`	336	`.filter(x -> x.getStatus().equals(in.shop2020.model.v1.order.OrderStatus.SUBMITTED_FOR_PROCESSING))`
337	`.map(x -> x.getLineItem()).collect(Collectors.toList());`	337	`.map(x -> x.getLineItem()).collect(Collectors.toList());`
338	`List<LineItem> billedOrderIds = order.stream()`	338	`List<LineItem> billedOrderIds = order.stream()`
339	`.filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.BILLED).map(x -> x.getLineItem())`	339	`.filter(x -> x.getStatus().equals(in.shop2020.model.v1.order.OrderStatus.BILLED))`
340	`.collect(Collectors.toList());`	340	`.map(x -> x.getLineItem()).collect(Collectors.toList());`
341	`List<LineItem> shippedOrderIds = order.stream()`	341	`List<LineItem> shippedOrderIds = order.stream()`
342	`.filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH)`	342	`.filter(x -> x.getStatus().equals(in.shop2020.model.v1.order.OrderStatus.SHIPPED_FROM_WH))`
343	`.map(x -> x.getLineItem()).collect(Collectors.toList());`	343	`.map(x -> x.getLineItem()).collect(Collectors.toList());`
344	`List<LineItem> grnPendingLineItemIds = order.stream()`	344	`List<LineItem> grnPendingLineItemIds = order.stream()`
345	`.filter(x -> x.getStatus() == in.shop2020.model.v1.order.OrderStatus.DELIVERY_SUCCESS)`	345	`.filter(x -> x.getStatus().equals(in.shop2020.model.v1.order.OrderStatus.DELIVERY_SUCCESS))`
346	`.map(x -> x.getLineItem()).collect(Collectors.toList());`	346	`.map(x -> x.getLineItem()).collect(Collectors.toList());`
347		347
348	`LOGGER.info("billedOrderIds {}", billedOrderIds);`	348	`LOGGER.info("billedOrderIds {}", billedOrderIds);`
349	`LOGGER.info("shippedOrderIds {}", shippedOrderIds);`	349	`LOGGER.info("shippedOrderIds {}", shippedOrderIds);`
350		350
Line 398...		Line 398...
398	`try {`	398	`try {`
399	`fofoStore = fofoStoreRepository.selectByRetailerId(loginDetails.getFofoId());`	399	`fofoStore = fofoStoreRepository.selectByRetailerId(loginDetails.getFofoId());`
400	`if (!fofoStore.isActive()) {`	400	`if (!fofoStore.isActive()) {`
401	`return "redirect:/login";`	401	`return "redirect:/login";`
402	`}`	402	`}`
403		403
404	`PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoStore.getId(), LocalDate.now());`	404	`PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoStore.getId(), LocalDate.now());`
405	`model.addAttribute("partnerType", partnerType);`	405	`model.addAttribute("partnerType", partnerType);`
406	`model.addAttribute("partnerTypeImage", PartnerType.imageMap.get(partnerType));`	406	`model.addAttribute("partnerTypeImage", PartnerType.imageMap.get(partnerType));`
407	`model.addAttribute("fofoStore", fofoStore);`	407	`model.addAttribute("fofoStore", fofoStore);`
408	`model.addAttribute("partnerType", partnerType);`	408	`model.addAttribute("partnerType", partnerType);`
Line 2003...		Line 2003...
2003	`return "activation-brandwise-report";`	2003	`return "activation-brandwise-report";`
2004	`}`	2004	`}`
2005		2005
2006	`@RequestMapping(value = "/getWarehouseBrandWiseItemActivatedModel", method = RequestMethod.GET)`	2006	`@RequestMapping(value = "/getWarehouseBrandWiseItemActivatedModel", method = RequestMethod.GET)`
2007	`public String getWarehouseBrandWiseItemActivatedModel(HttpServletRequest request, Model model,`	2007	`public String getWarehouseBrandWiseItemActivatedModel(HttpServletRequest request, Model model,`
2008	`@RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {`	2008	`@RequestParam List<Integer> warehouseId, @RequestParam String brand) throws Exception {`
2009	`LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);`	2009	`LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);`
2010	`List<Integer> fofoIds = getFofoIds(loginDetails);`	2010	`List<Integer> fofoIds = getFofoIds(loginDetails);`
2011		2011
2012	`Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;`	2012	`Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;`
2013	`List<WarehouseBrandWiseItemActivatedModel> activatedItems = activatedImeiRepository`	2013	`List<WarehouseBrandWiseItemActivatedModel> activatedItems = activatedImeiRepository`