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

     @Autowired
     private LoanStatementRepository loanStatementRepository;
     @Autowired
     PositionRepository positionRepository;
+    @Autowired
+    UserWalletRepository userWalletRepository;
     @PostMapping(value = "/reports/{projectName}/{fileName}")
     public ResponseEntity<?> fetchReport(HttpServletRequest request, @PathVariable String fileName,
                                          @PathVariable ReporticoProject projectName, @RequestBody Map<String, String> paramsMap)
             throws ProfitMandiBusinessException, UnsupportedOperationException, IOException {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
             startDate = LocalDate.now().minusDays(30);
             endDate = LocalDate.now();
+        }
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(fofoDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(fofoDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         model.addAttribute("startDate", startDate);
         model.addAttribute("endDate", endDate);
+        }
         endDate = LocalDate.now();
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         model.addAttribute("startDate", startDate);
         model.addAttribute("endDate", endDate);
             startDate = LocalDate.now().minusDays(30);
             endDate = LocalDate.now();
+        }
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         model.addAttribute("startDate", startDate);
         model.addAttribute("endDate", endDate);
             throws Exception {
         List<List<?>> rows = new ArrayList<>();
         LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
         boolean isAdmin = roleManager.isAdmin(fofoDetails.getRoleIds());
-        float openingBalance = 0;
-        float openingPendingAmount = 0;
-        List<WalletSummaryReportModel> walletSummartList = null;
-        if (isAdmin) {
-            if (fofoId == 0)
-                walletSummartList = new ArrayList<>();
-            else
-                walletSummartList = fofoOrderRepository.selectWalletSummaryReport(
-                        fofoId, startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
-            openingBalance = walletService.getOpeningTill(fofoId, startDate.atStartOfDay());
-            Map<Integer, Float> openingAmountMap = transactionService.getPendingIndentValueMap(startDate.atStartOfDay(), Optional.of(fofoId));
-            openingPendingAmount = openingAmountMap.get(fofoId) == null ? 0 : openingAmountMap.get(fofoId);
-        } else {
+        if (!isAdmin) fofoId = fofoDetails.getFofoId();
-            walletSummartList = fofoOrderRepository.selectWalletSummaryReport(
+        List<WalletSummaryReportModel> walletSummaryList = fofoOrderRepository.selectWalletSummaryReport(
-                    fofoDetails.getFofoId(), startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
+                fofoId, startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
+        double openingBalance = walletService.getOpeningTill(fofoId, startDate.atStartOfDay());
-        }
-        LOGGER.info("walletSummartList {}", fofoId);
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm");
         String partnerDetail = null;
 // Headers for the table data
         rows.add(Arrays.asList(
-//                "Id","Business_timestamp",
-                "timestamp", "Reference_type", "Reference", "Amount", "Refundable_amount", "Running Balance", "Description"));
+                "Timestamp", "Reference_type", "Reference", "Amount", "Running Balance", "Description"));
+        double runningBalance = openingBalance;
+        for (
-        for (WalletSummaryReportModel walletSummary : walletSummartList) {
+                WalletSummaryReportModel walletSummary : walletSummaryList) {
+            runningBalance += walletSummary.getAmount();
             partnerDetail = walletSummary.getName() + "(" + walletSummary.getCode() + "-" + walletSummary.getPhone() + ")" + "-" + walletSummary.getEmail();
             rows.add(Arrays.asList(
-//                    walletSummary.getId(),
-//                    FormattingUtils.format(walletSummary.getBusinessTimestamp() != null ? walletSummary.getBusinessTimestamp() : walletSummary.getTimestamp()),
-                    walletSummary.getTimestamp(),
+                    FormattingUtils.format(walletSummary.getTimestamp()),
                     walletSummary.getReferenceType(),
                     walletSummary.getReference(),
                     walletSummary.getAmount(),
-                    walletSummary.getRefundableAmount(),
-                    openingBalance + walletSummary.getAmount(),
+                    runningBalance,
                     walletSummary.getDescription()
             ));
+        }
-        float openingBalanceWithOpeningPendingAmount = openingPendingAmount + openingBalance;
         org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil
-                .getCSVByteStream(Arrays.asList("Opening Balance - : " + openingBalanceWithOpeningPendingAmount), rows);
+                .getCSVByteStream(Arrays.asList("Opening Balance - : " + openingBalance), rows);
         ResponseEntity<?> responseEntity = orderService.downloadReportInCsv(baos, rows, partnerDetail + " Wallet Statement Report");
         return responseEntity;
+    }
     @RequestMapping(value = "/walletSummaryFetchReportByDate", method = RequestMethod.GET)
     public String getwalletSummaryFetchReport(HttpServletRequest request, Model model, @RequestParam(defaultValue = "0") int fofoId,
                                               @RequestParam(required = false) LocalDate startDate,
                                               @RequestParam(required = false) LocalDate endDate)
             throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        UserWallet userWallet = userWalletRepository.selectByRetailerId(fofoId);
         boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
         if (startDate == null) {
             startDate = LocalDate.now().minusDays(30);
+        }
         if (endDate == null) {
         } else {
             walletSummartList = fofoOrderRepository.selectWalletSummaryReport(loginDetails.getFofoId(), startDate.atStartOfDay(), endDate.atTime(LocalTime.MAX));
+        }
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         LOGGER.info("walletSummartList {}", walletSummartList);
         model.addAttribute("walletSummartList", walletSummartList);
         model.addAttribute("openingBalance", (openingBalance + openingPendingAmount));
         model.addAttribute("startDate", startDate);
         model.addAttribute("endDate", endDate);
         model.addAttribute("isAdmin", isAdmin);
+        model.addAttribute("userWallet", userWallet);
         return "wallet-summary-report";
+    }
     @RequestMapping(value = "/walletSummaryReport", method = RequestMethod.GET)
     public String getWalletSummaryReport(HttpServletRequest request, Model model) throws Exception {
     public String getPendingIndentReport(HttpServletRequest request, Model model) throws Exception {
         LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
         boolean isAdmin = roleManager.isAdmin(fofoDetails.getRoleIds());
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(fofoDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(fofoDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         LocalDateTime currentDate = LocalDate.now().atStartOfDay();
             startDate = LocalDate.now().minusDays(30);
             endDate = LocalDate.now();
+        }
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(fofoDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(fofoDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         model.addAttribute("startDate", startDate);
             startDate = LocalDate.now().minusDays(30);
             endDate = LocalDate.now();
+        }
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         model.addAttribute("startDate", startDate);
         model.addAttribute("endDate", endDate);
             startDate = LocalDate.now().minusDays(30);
             endDate = LocalDate.now();
+        }
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            List<Integer> fofoIds = pp.get(authUser.getId());
+                List<Integer> fofoIds = pp.get(authUser.getId());
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         model.addAttribute("startDate", startDate);
     public String getOfferPayoutReport(HttpServletRequest request, Model model, @RequestParam(required = false) LocalDate startDate, @RequestParam(required = false) LocalDate endDate) throws Exception {
         LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
         boolean isAdmin = roleManager.isAdmin(fofoDetails.getRoleIds());
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(fofoDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(fofoDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         if (startDate == null) {
             startDate = LocalDate.now().minusDays(30);
             startDate = LocalDate.now().minusDays(30);
             endDate = LocalDate.now();
+        }
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         model.addAttribute("startDate", startDate);
         model.addAttribute("endDate", endDate);
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
-            Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
+                Set<Integer> fofoIds = new HashSet<>(pp.get(authUser.getId()));
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(x);
+                        return retailerService.getFofoRetailers(true).get(x);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isAdmin", isAdmin);
         model.addAttribute("isRBM", isRBM);
             throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         boolean isAdmin = roleManager.isAdmin(loginDetails.getRoleIds());
         boolean isRBM = false;
         if (isAdmin) {
-        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+            AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-        List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
+            List<Position> positions = positionRepository.selectPositionByAuthId(authUser.getId());
             isRBM = positions.stream()
-                .anyMatch(position ->
+                    .anyMatch(position ->
-                        ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
+                            ProfitMandiConstants.TICKET_CATEGORY_RBM == position.getCategoryId());
-        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
+            Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
             if (isRBM && pp.containsKey(authUser.getId())) {
                 List<Integer> fofoIds = pp.get(authUser.getId());
-            Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(fofoId -> {
+                Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(fofoId -> {
-                try {
+                    try {
-                    return retailerService.getFofoRetailers(true).get(fofoId);
+                        return retailerService.getFofoRetailers(true).get(fofoId);
-                } catch (ProfitMandiBusinessException e) {
+                    } catch (ProfitMandiBusinessException e) {
-                    // TODO Auto-generated catch block
+                        // TODO Auto-generated catch block
-                    return null;
+                        return null;
-                }
+                    }
-            }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
+                }).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-            model.addAttribute("customRetailersMap", customRetailersMap);
+                model.addAttribute("customRetailersMap", customRetailersMap);
+            }
+        }
         model.addAttribute("isRBM", isRBM);
         model.addAttribute("isAdmin", isAdmin);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java – Rev 34093 → 34096