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

 	@Autowired
 	private ResponseSender<?> responseSender;
 	@Autowired
 	private PendingOrderRepository pendingOrderRepository;
 	@Autowired
 	private OrderRepository orderRepository;
 	@Autowired
 	private PendingOrderItemRepository pendingOrderItemRepository;
 	@Autowired
 	private FofoStoreRepository fofoStoreRepository;
 					paymentOptionTransaction);
+		}
 		return paymentOptionIdPaymentOptionTransactionMap;
+	}
 	@RequestMapping(value = "/create-order", method = RequestMethod.POST)
 	public String createOrder(HttpServletRequest request, @RequestBody CreateOrderRequest createOrderRequest,
 			Model model) throws ProfitMandiBusinessException {
 		// throw new ProfitMandiBusinessException("Billing is on hold temporarily",
 		// "Billing is on hold temporarily", "Billing is on hold temporarily");
 		List<PendingOrderItem> pendingOrderItem = null;
 		if (isAdmin) {
 			pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatus(OrderStatus.CLAIMED);
-			Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
+			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
+			Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
+					.filter(x -> x != null).collect(Collectors.toList()).stream()
+					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
 			model.addAttribute("customRetailersMap", customRetailersMap);
 		} else {
 			pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatusAndFofoId(OrderStatus.CLAIMED,
 					loginDetails.getFofoId());
 		LOGGER.info("endTime" + endTime);
 		List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
 				.collect(Collectors.toList());
-		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
+		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
+		Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
+				.filter(x -> x != null).collect(Collectors.toList()).stream()
+				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
 		model.addAttribute("customRetailersMap", customRetailersMap);
 		List<PendingOrderItem> pendingOrderItem = null;
 		if (startTime == null) {
 			pendingOrderItem = pendingOrderItemRepository.selectOrderItemByStatus(status);
 		model.addAttribute("partnerInventoryMap", map.get("partnerInventoryMap"));
 		model.addAttribute("isAdmin", isAdmin);
 		return "online-order-item";
+	}
 	@RequestMapping(value = "/franchiseeSalesReport", method = RequestMethod.GET)
-	public String getFranchiseeSalesReport(HttpServletRequest request,
+	public String getFranchiseeSalesReport(HttpServletRequest request, Model model)
-			Model model) throws ProfitMandiBusinessException {
+			throws ProfitMandiBusinessException {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusDays(30).toLocalDate().atStartOfDay();
-		FofoStore fs =fofoStoreRepository.selectByRetailerId(fofoDetails.getFofoId());
+		FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoDetails.getFofoId());
+		List<FocoSaleReportModel> focoSaleReportList = fofoOrderRepository.selectFocoSaleReport(fofoDetails.getFofoId(),
+				fs.getCode(), currentStartMonth, currentDate);
-	    List<FocoSaleReportModel> focoSaleReportList =fofoOrderRepository.selectFocoSaleReport(fofoDetails.getFofoId(),fs.getCode(),currentStartMonth, currentDate);
 		LOGGER.info("focoSaleReportList {}", focoSaleReportList);
-		model.addAttribute("startDate",currentDate.minusDays(30).toLocalDate());
+		model.addAttribute("startDate", currentDate.minusDays(30).toLocalDate());
 		model.addAttribute("endDate", LocalDate.now());
 		model.addAttribute("focoSaleReportList", focoSaleReportList);
 		return "foco-sale-report";
+	}
 	@RequestMapping(value = "/downloadFranchiseeSales", method = RequestMethod.GET)
 	public ResponseEntity<?> getdownloadFranchiseeSales(HttpServletRequest request,
 			@RequestParam(name = "startDate", required = true, defaultValue = "") LocalDate startDate,
 			@RequestParam(name = "endDate", required = true, defaultValue = "") LocalDate endDate, Model model)
 			throws Exception {
 		ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "Franchisee Sales Report");
 		return responseEntity;
+	}
 	@RequestMapping(value = "/downloadWalletSummaryReport", method = RequestMethod.GET)
 	public ResponseEntity<?> getDownloadWalletSummaryReport(HttpServletRequest request,
 			@RequestParam(name = "startDate", required = true, defaultValue = "") LocalDate startDate,
 			@RequestParam(name = "endDate", required = true, defaultValue = "") LocalDate endDate, Model model)
 			throws Exception {
 		ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "Wallet Statement Report");
 		return responseEntity;
+	}
 	@RequestMapping(value = "/walletSummaryReport", method = RequestMethod.GET)
-	public String getWalletSummaryReport(HttpServletRequest request,
+	public String getWalletSummaryReport(HttpServletRequest request, Model model) throws Exception {
-			Model model) throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusDays(30).toLocalDate().atStartOfDay();
+		List<WalletSummaryReportModel> walletSummartList = fofoOrderRepository
-		List<WalletSummaryReportModel> walletSummartList =fofoOrderRepository.selectWalletSummaryReport(fofoDetails.getFofoId(),currentStartMonth, currentDate);
+				.selectWalletSummaryReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
 		LOGGER.info("walletSummartList {}", walletSummartList);
-		model.addAttribute("startDate",currentDate.minusDays(30).toLocalDate());
+		model.addAttribute("startDate", currentDate.minusDays(30).toLocalDate());
 		model.addAttribute("endDate", LocalDate.now());
 		model.addAttribute("walletSummartList", walletSummartList);
 		return "wallet-summary-report";
+	}
 	@RequestMapping(value = "/pendingIndentReport", method = RequestMethod.GET)
-	public String getPendingIndentReport(HttpServletRequest request,
+	public String getPendingIndentReport(HttpServletRequest request, Model model) throws Exception {
-			Model model) throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(2).toLocalDate().atStartOfDay();
+		List<PendingIndentReportModel> pendingIndentReports = fofoOrderRepository
-		List<PendingIndentReportModel> pendingIndentReports =fofoOrderRepository.selectPendingIndentReport(fofoDetails.getFofoId(),currentStartMonth, currentDate);
+				.selectPendingIndentReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
 		LOGGER.info("pendingIndentReports {}", pendingIndentReports);
-		model.addAttribute("startDate",currentDate.minusMonths(2).toLocalDate());
+		model.addAttribute("startDate", currentDate.minusMonths(2).toLocalDate());
 		model.addAttribute("endDate", LocalDate.now());
 		model.addAttribute("pendingIndentReports", pendingIndentReports);
 		return "pending-indent-report";
+	}
 	@RequestMapping(value = "/pendingIndentReportDownload", method = RequestMethod.GET)
-	public ResponseEntity<?> getPendingIndentReportDownload(HttpServletRequest request,
+	public ResponseEntity<?> getPendingIndentReportDownload(HttpServletRequest request, Model model) throws Exception {
-			Model model) throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(2).toLocalDate().atStartOfDay();
 		List<List<?>> rows = new ArrayList<>();
+		List<PendingIndentReportModel> pendingIndentReports = fofoOrderRepository
-		List<PendingIndentReportModel> pendingIndentReports =fofoOrderRepository.selectPendingIndentReport(fofoDetails.getFofoId(),currentStartMonth, currentDate);
+				.selectPendingIndentReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
 		LOGGER.info("pendingIndentReports {}", pendingIndentReports);
-      for( PendingIndentReportModel pir : pendingIndentReports) {
+		for (PendingIndentReportModel pir : pendingIndentReports) {
-			rows.add(Arrays.asList(pir.getTransactionId(),pir.getOrderId(),pir.getCreatTimestamp(),pir.getItemId()
+			rows.add(Arrays.asList(pir.getTransactionId(), pir.getOrderId(), pir.getCreatTimestamp(), pir.getItemId(),
-					,pir.getBrand(),pir.getModelName(),pir.getModelNumber(),pir.getColor(),pir.getQuantity()
+					pir.getBrand(), pir.getModelName(), pir.getModelNumber(), pir.getColor(), pir.getQuantity(),
-					,pir.getUnitPrice(),pir.getWalletAmount(),pir.getStatus(),pir.getInvoiceNumber(),
+					pir.getUnitPrice(), pir.getWalletAmount(), pir.getStatus(), pir.getInvoiceNumber(),
 					pir.getBillingTimestamp()));
+		}
-		org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil
-				.getCSVByteStream(Arrays.asList("Transaction Id", "Order Id","Created_At", "Item_Id", "Brand", "Model Name",
-						"Model Number", "Color"  ,"Quantity", "Unit Price", "Wallet Deduction", "Status", "Invoice Number", "Billing Timestamp"),rows);
-		ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows,"Order Status Summary Report");
+		org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList(
+				"Transaction Id", "Order Id", "Created_At", "Item_Id", "Brand", "Model Name", "Model Number", "Color",
+				"Quantity", "Unit Price", "Wallet Deduction", "Status", "Invoice Number", "Billing Timestamp"), rows);
+		ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "Order Status Summary Report");
 		return responseEntity;
+	}
 	@RequestMapping(value = "/schemePayoutReport", method = RequestMethod.GET)
-	public String getSchemePayoutReport(HttpServletRequest request,
+	public String getSchemePayoutReport(HttpServletRequest request, Model model) throws Exception {
-			Model model) throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
+		List<SchemePayoutReportModel> schemePayoutReports = fofoOrderRepository
-		List<SchemePayoutReportModel> schemePayoutReports =fofoOrderRepository.selectSchemePayoutReport(fofoDetails.getFofoId(),currentStartMonth, currentDate);
+				.selectSchemePayoutReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
 		LOGGER.info("schemePayoutReports {}", schemePayoutReports);
-		model.addAttribute("startDate",currentDate.minusMonths(3).toLocalDate());
+		model.addAttribute("startDate", currentDate.minusMonths(3).toLocalDate());
 		model.addAttribute("endDate", LocalDate.now());
 		model.addAttribute("schemePayoutReports", schemePayoutReports);
 		return "scheme-payout-report";
+	}
 	@RequestMapping(value = "/selectPartnerBillingSummaryReport", method = RequestMethod.GET)
-	public String getselectPartnerBillingSummaryReport(HttpServletRequest request,
+	public String getselectPartnerBillingSummaryReport(HttpServletRequest request, Model model) throws Exception {
-			Model model) throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
+		List<PartnerBillingSummaryModel> partnerBillingSummaryReports = fofoOrderRepository
-		List<PartnerBillingSummaryModel> partnerBillingSummaryReports = fofoOrderRepository.selectPartnerBillingSummaryReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
+				.selectPartnerBillingSummaryReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
-		model.addAttribute("startDate",currentDate.minusMonths(3).toLocalDate());
+		model.addAttribute("startDate", currentDate.minusMonths(3).toLocalDate());
 		model.addAttribute("endDate", LocalDate.now());
 		model.addAttribute("partnerBillingSummaryReports", partnerBillingSummaryReports);
 		return "partner-billing-summary-report";
+	}
 	@RequestMapping(value = "/priceDropReport", method = RequestMethod.GET)
-	public String getSelectPriceDropReport(HttpServletRequest request,
+	public String getSelectPriceDropReport(HttpServletRequest request, Model model) throws Exception {
-			Model model) throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
-		List<PriceDropReportModel> priceDropReports = orderRepository.selectPriceDropReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
+		List<PriceDropReportModel> priceDropReports = orderRepository.selectPriceDropReport(fofoDetails.getFofoId(),
+				currentStartMonth, currentDate);
-		model.addAttribute("startDate",currentDate.minusMonths(3).toLocalDate());
+		model.addAttribute("startDate", currentDate.minusMonths(3).toLocalDate());
 		model.addAttribute("endDate", LocalDate.now());
 		model.addAttribute("priceDropReports", priceDropReports);
 		return "price-drop-report";
+	}
 	@RequestMapping(value = "/downloadPriceDropReport", method = RequestMethod.GET)
-	public  ResponseEntity<?> getSelectDownloadPriceDropReport(HttpServletRequest request,
+	public ResponseEntity<?> getSelectDownloadPriceDropReport(HttpServletRequest request, Model model)
-			Model model) throws Exception {
+			throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
 		List<List<?>> rows = new ArrayList<>();
-		List<PriceDropReportModel> priceDropReports = orderRepository.selectPriceDropReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
+		List<PriceDropReportModel> priceDropReports = orderRepository.selectPriceDropReport(fofoDetails.getFofoId(),
+				currentStartMonth, currentDate);
-     for (PriceDropReportModel pdr : priceDropReports) {
+		for (PriceDropReportModel pdr : priceDropReports) {
-			rows.add(Arrays.asList(pdr.getCode(), pdr.getId(), pdr.getBrand(),pdr.getModelName(),
+			rows.add(Arrays.asList(pdr.getCode(), pdr.getId(), pdr.getBrand(), pdr.getModelName(), pdr.getModelNumber(),
-					pdr.getModelNumber(), pdr.getAffectedOn() ,pdr.getAmount(), pdr.getPartnerPayout(),
+					pdr.getAffectedOn(), pdr.getAmount(), pdr.getPartnerPayout(), pdr.getImei(), pdr.getStatus(),
-					pdr.getImei(), pdr.getStatus(),pdr.getUpdateTimestamp(),pdr.getRejectionReason()));
+					pdr.getUpdateTimestamp(), pdr.getRejectionReason()));
+		}
 		org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil
-				.getCSVByteStream(Arrays.asList("code","Price_Drop_Id","brand","model_name","model_number"
+				.getCSVByteStream(Arrays.asList("code", "Price_Drop_Id", "brand", "model_name", "model_number",
-						,"affected_on","amount", "partner_payout", "Imei", "status","processed_on"
+						"affected_on", "amount", "partner_payout", "Imei", "status", "processed_on", "Reason"), rows);
-						  ,  "Reason"), rows);
 		ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "price drop report");
 		return responseEntity;
+	}
 	@RequestMapping(value = "/downloadPartnerBillingSummaryReport", method = RequestMethod.GET)
 	public ResponseEntity<?> getdownloadPartnerBillingSummaryReport(HttpServletRequest request,
 			@RequestParam(name = "startDate", required = true, defaultValue = "") LocalDate startDate,
 			@RequestParam(name = "endDate", required = true, defaultValue = "") LocalDate endDate, Model model)
 			throws Exception {
 		List<List<?>> rows = new ArrayList<>();
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
+		List<PartnerBillingSummaryModel> partnerBillingSummaryReports = fofoOrderRepository
-		List<PartnerBillingSummaryModel> partnerBillingSummaryReports = fofoOrderRepository.selectPartnerBillingSummaryReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
+				.selectPartnerBillingSummaryReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
 		for (PartnerBillingSummaryModel pbsr : partnerBillingSummaryReports) {
-			rows.add(Arrays.asList(pbsr.getId(), pbsr.getCreateTimestamp(), pbsr.getBillingTimestamp(),pbsr.getDeliveryTimestamp(),
+			rows.add(Arrays.asList(pbsr.getId(), pbsr.getCreateTimestamp(), pbsr.getBillingTimestamp(),
-					pbsr.getDeliveryTimestamp(), pbsr.getPartnerGrnTimestamp() ,pbsr.getTransactionId(), pbsr.getLogisticsTransactionId(),
+					pbsr.getDeliveryTimestamp(), pbsr.getDeliveryTimestamp(), pbsr.getPartnerGrnTimestamp(),
+					pbsr.getTransactionId(), pbsr.getLogisticsTransactionId(), pbsr.getAirwayBillNumber(),
-					pbsr.getAirwayBillNumber(), pbsr.getStatusSubGroup(), pbsr.getStatusName(),pbsr.getRetailerId(), pbsr.getRetailerName(),pbsr.getItemId(), pbsr.getBrand()
+					pbsr.getStatusSubGroup(), pbsr.getStatusName(), pbsr.getRetailerId(), pbsr.getRetailerName(),
-					         , pbsr.getModelName(),  pbsr.getModelNumber(),pbsr.getColor(),pbsr.getUnitPrice(), pbsr.getQuantity(),
+					pbsr.getItemId(), pbsr.getBrand(), pbsr.getModelName(), pbsr.getModelNumber(), pbsr.getColor(),
+					pbsr.getUnitPrice(), pbsr.getQuantity(), pbsr.getTotalPrice(), pbsr.getInvoiceNumber(),
-					          pbsr.getTotalPrice(),pbsr.getInvoiceNumber(), pbsr.getIgstRate(),pbsr.getCgstRate(),pbsr.getSgstRate()));
+					pbsr.getIgstRate(), pbsr.getCgstRate(), pbsr.getSgstRate()));
+		}
-		org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil
+		org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("OrderId",
-				.getCSVByteStream(Arrays.asList("OrderId","CREATION_DATE","BILLING_DATE","DELIVERED_ON","SCANNED_IN_ON"
+				"CREATION_DATE", "BILLING_DATE", "DELIVERED_ON", "SCANNED_IN_ON", "Transaction_id", "master_order_id",
-						,"Transaction_id","master_order_id", "airwaybill_no", "statusSubGroupp", "statusName","customer_id"
+				"airwaybill_no", "statusSubGroupp", "statusName", "customer_id", "customer_name", "Item_Id", "brand",
-						  ,  "customer_name","Item_Id", "brand", "model_name",  "model_number" ,"color", "selling_price"
+				"model_name", "model_number", "color", "selling_price", "Quantity", "total_price", "invoice_number",
-						                 ,"Quantity","total_price","invoice_number","igstrate","cgstrate","sgstrate"), rows);
+				"igstrate", "cgstrate", "sgstrate"), rows);
 		ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "Billing Statement Report");
 		return responseEntity;
+	}
 	@RequestMapping(value = "/invoiceSchemeOutSummaryReport", method = RequestMethod.GET)
-	public String getInvoiceSchemeOutSummaryReport(HttpServletRequest request,
+	public String getInvoiceSchemeOutSummaryReport(HttpServletRequest request, Model model) throws Exception {
-			Model model) throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
+		List<FocoSchemeOutReportModel> focoSchemeOutReports = fofoOrderRepository
-		List<FocoSchemeOutReportModel> focoSchemeOutReports =fofoOrderRepository.selectInvoiceSchemeOutSummaryReport(fofoDetails.getFofoId(),currentStartMonth, currentDate);
+				.selectInvoiceSchemeOutSummaryReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
 		LOGGER.info("focoSchemeOutReportModel {}", focoSchemeOutReports);
-		model.addAttribute("startDate",currentDate.minusMonths(3).toLocalDate());
+		model.addAttribute("startDate", currentDate.minusMonths(3).toLocalDate());
 		model.addAttribute("endDate", LocalDate.now());
 		model.addAttribute("focoSchemeOutReports", focoSchemeOutReports);
 		return "invoicewise-scheme-out-report";
+	}
 	@RequestMapping(value = "/downloadInvoiceSchemeOutSummaryReport", method = RequestMethod.GET)
-	public ResponseEntity<?> getDownloadInvoiceSchemeOutSummaryReport(HttpServletRequest request,
+	public ResponseEntity<?> getDownloadInvoiceSchemeOutSummaryReport(HttpServletRequest request, Model model)
-			Model model) throws Exception {
+			throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		List<List<?>> rows = new ArrayList<>();
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
+		List<FocoSchemeOutReportModel> focoSchemeOutReports = fofoOrderRepository
-		List<FocoSchemeOutReportModel> focoSchemeOutReports =fofoOrderRepository.selectInvoiceSchemeOutSummaryReport(fofoDetails.getFofoId(),currentStartMonth, currentDate);
+				.selectInvoiceSchemeOutSummaryReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
 		LOGGER.info("focoSchemeOutReportModel {}", focoSchemeOutReports);
-		for( FocoSchemeOutReportModel  fsor : focoSchemeOutReports) {
+		for (FocoSchemeOutReportModel fsor : focoSchemeOutReports) {
-			rows.add(Arrays.asList(fsor.getInvoiceNumber(),fsor.getQuantity(),fsor.getBrand(),fsor.getModelName()
+			rows.add(Arrays.asList(fsor.getInvoiceNumber(), fsor.getQuantity(), fsor.getBrand(), fsor.getModelName(),
-					,fsor.getModelNumber(),fsor.getColor(),fsor.getAmount()));
+					fsor.getModelNumber(), fsor.getColor(), fsor.getAmount()));
+		}
-		org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil
+		org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(
-				.getCSVByteStream(Arrays.asList("InvoiceNumber", "Quantity","Brand", "Model Name", "Model Number",
+				Arrays.asList("InvoiceNumber", "Quantity", "Brand", "Model Name", "Model Number", "Color", "Amount"),
-						 "Color"  ,"Amount"),rows);
+				rows);
-		ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "invoice wise scheme out Summary Report");
+		ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows,
+				"invoice wise scheme out Summary Report");
 		return responseEntity;
+	}
 	@RequestMapping(value = "/schemePayoutReportDownload", method = RequestMethod.GET)
-	public ResponseEntity<?> getSchemePayoutReportDownload(HttpServletRequest request,
+	public ResponseEntity<?> getSchemePayoutReportDownload(HttpServletRequest request, Model model) throws Exception {
-			Model model) throws Exception {
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 		List<List<?>> rows = new ArrayList<>();
 		LocalDateTime currentDate = LocalDate.now().atStartOfDay();
 		LocalDateTime currentStartMonth = currentDate.minusMonths(3).toLocalDate().atStartOfDay();
+		List<SchemePayoutReportModel> schemePayoutReports = fofoOrderRepository
-		List<SchemePayoutReportModel> schemePayoutReports =fofoOrderRepository.selectSchemePayoutReport(fofoDetails.getFofoId(),currentStartMonth, currentDate);
+				.selectSchemePayoutReport(fofoDetails.getFofoId(), currentStartMonth, currentDate);
 		LOGGER.info("schemePayoutReports {}", schemePayoutReports);
-		 for( SchemePayoutReportModel spr : schemePayoutReports) {
-				rows.add(Arrays.asList(spr.getId(),spr.getSerialNumber(),spr.getBrand(),spr.getModelName()
-						,spr.getModelNumber(),spr.getColor(),spr.getSchemeInDp(),spr.getSchemeOutDp(),
-						spr.getSchemeId(),spr.getName(),spr.getType(),spr.getAmountType(),spr.getPurchaseReference()
-						,spr.getInvoiceNumber(),spr.getSioAmount(),spr.getStatus(),spr.getStatusDescription()
-						,spr.getCreateTimestamp(),spr.getRolledBackTimestamp()));
-			}
-			org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil
-					.getCSVByteStream(Arrays.asList("Item_Id", "serial_number","Brand", "Model Name", "Model Number",
-							 "Color"  ,"Scheme_IN_DP", "Scheme_out_dp", "Scheme_Id", "Name", "Type", "amount", "Purchase_Invoice",
-							 "SALE_INOVOICE","Amount","status","description","create_timestamp","rolled_back_timestamp"),rows);
-			ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "Scheme Payout Summary Report");
+		for (SchemePayoutReportModel spr : schemePayoutReports) {
+			rows.add(Arrays.asList(spr.getId(), spr.getSerialNumber(), spr.getBrand(), spr.getModelName(),
+					spr.getModelNumber(), spr.getColor(), spr.getSchemeInDp(), spr.getSchemeOutDp(), spr.getSchemeId(),
+					spr.getName(), spr.getType(), spr.getAmountType(), spr.getPurchaseReference(),
+					spr.getInvoiceNumber(), spr.getSioAmount(), spr.getStatus(), spr.getStatusDescription(),
+					spr.getCreateTimestamp(), spr.getRolledBackTimestamp()));
+		}
+		org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("Item_Id",
+				"serial_number", "Brand", "Model Name", "Model Number", "Color", "Scheme_IN_DP", "Scheme_out_dp",
+				"Scheme_Id", "Name", "Type", "amount", "Purchase_Invoice", "SALE_INOVOICE", "Amount", "status",
+				"description", "create_timestamp", "rolled_back_timestamp"), rows);
+		ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, "Scheme Payout Summary Report");
-			return responseEntity;
+		return responseEntity;
+	}
 	@GetMapping("/getAllOnlineOrder")
 	public String getAllOrders(HttpServletRequest request, @RequestParam(required = false) LocalDate date, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
 		LOGGER.info("date" + date);
 		List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
 				.collect(Collectors.toList());
-		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
+		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
+		Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
+				.filter(x -> x != null).collect(Collectors.toList()).stream()
+				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
 		model.addAttribute("customRetailersMap", customRetailersMap);
 		List<PendingOrderItem> pendingOrderItem = null;
 		pendingOrderItem = pendingOrderItemRepository.selectAll(date.atStartOfDay(), LocalDateTime.now());

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java – Rev 30322 → 30426