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

                 Arrays.asList(OrderStatus.BILLED, OrderStatus.SHIPPED_FROM_WH, OrderStatus.SHIPPED_TO_LOGST, OrderStatus.DELIVERY_SUCCESS, OrderStatus.ACCEPTED, OrderStatus.SUBMITTED_FOR_PROCESSING),
                 curDate, curDate.with(LocalTime.MAX)).stream().collect(Collectors.toMap(x -> x.getId(), x -> x.getAmount()));
         double purchasedFtd = secondaryToday.getOrDefault(fofoId, 0.0);
+        MonthlyTarget monthlyTarget = monthlyTargetRepository.selectByDateAndFofoId(YearMonth.now(), fofoId);
         double purchaseTargetFtd = rbmTargetService.calculateFofoIdTodayTarget(fofoId, purchaseMtd);
         double saleMtd = (Double) fofoUser.getSales(fofoId).get("mtdSale");
         double recoverableAmount = saleMtd - purchaseMtd;
         SDCreditRequirement sdCreditRequirement = sdCreditRequirementRepository.selectByFofoId(fofoId);
-        BigDecimal availableLimit = sdCreditRequirement.getAvailableLimit();
         UserWallet userWallet = walletService.getUserWallet(fofoId);
-        BigDecimal totalAvailableFunds = availableLimit.add(BigDecimal.valueOf(userWallet.getAmount()));
+        BigDecimal totalAvailableFunds = sdCreditRequirement.getAvailableLimit().add(BigDecimal.valueOf(userWallet.getAmount()));
         List<Loan> loans = loanRepository.selectActiveLoan(fofoId);
+        double totalPendingAmount = loans.stream()
+                .map(Loan::getPendingAmount)
+                .mapToDouble(BigDecimal::doubleValue)
+                .sum();
         boolean isLoanPending = false;
         if (loans.size() > 0) {
             isLoanPending = true;
+        }
-//      Sort the BRANDS list based on MTD sale in descending order
+        List<String> sortedBrandsByMtd = brandToMtdMap.entrySet()
+                .stream()
-        List<String> sortedBrands = ProfitMandiConstants.BRANDS.stream()
+                .sorted((e1, e2) -> Long.compare(e2.getValue(), e1.getValue())) // Descending MTD
-                .sorted((b1, b2) -> {
+                .map(Map.Entry::getKey)
-                    long mtd1 = brandToMtdMap.getOrDefault(b1, 0L);
+                .collect(Collectors.toList());
-                    long mtd2 = brandToMtdMap.getOrDefault(b2, 0L);
+        List<String> remainingBrands = ProfitMandiConstants.BRANDS.stream()
-                    return Long.compare(mtd2, mtd1); // descending
+                .filter(x -> !brandToMtdMap.containsKey(x))
-                }).collect(Collectors.toList());
+                .collect(Collectors.toList());
+        List<String> finalSortedBrands = new ArrayList<>();
+        finalSortedBrands.addAll(sortedBrandsByMtd);
+        finalSortedBrands.addAll(remainingBrands);
         List<PartnerWarehouseStockSummaryModel> partnerWarehouseStockSummaryModels = saholicInventoryService.getSaholicAndPartnerStock(fofoId, fofoStore.getWarehouseId());
         Set<Integer> catalogIds = partnerWarehouseStockSummaryModels.stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
+        LOGGER.info("fofoid {} , catalogIds {}", catalogIds, fofoId);
         List<DateWiseSoldCatalogQtyModel> sevenDayAboveSoldsCatalogs = fofoOrderRepository.getDateWiseSoldCatalogQty(fofoId, catalogIds, presentDate.minusDays(7));
-        Map<Integer, DateWiseSoldCatalogQtyModel> sevenDayAboveSoldsCatalogsMap = sevenDayAboveSoldsCatalogs.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
         List<DateWiseSoldCatalogQtyModel> fourteenDayAboveSoldsCatalogs = fofoOrderRepository.getDateWiseSoldCatalogQty(fofoId, catalogIds, presentDate.minusDays(14));
-        Map<Integer, DateWiseSoldCatalogQtyModel> fourteenDayAboveSoldsCatalogsMap = fourteenDayAboveSoldsCatalogs.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
         List<DateWiseSoldCatalogQtyModel> twentyOneDayAboveSoldsCatalogs = fofoOrderRepository.getDateWiseSoldCatalogQty(fofoId, catalogIds, presentDate.minusDays(21));
-        Map<Integer, DateWiseSoldCatalogQtyModel> twentyOneDayAboveSoldsCatalogsMap = twentyOneDayAboveSoldsCatalogs.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
         LOGGER.info("twentyOneDayAboveSoldsCatalogs {}", twentyOneDayAboveSoldsCatalogs);
         List<DateWiseSoldCatalogQtyModel> twentyEightDayAboveSoldsCatalogs = fofoOrderRepository.getDateWiseSoldCatalogQty(fofoId, catalogIds, presentDate.minusDays(28));
-        Map<Integer, DateWiseSoldCatalogQtyModel> twentyEightDayAboveSoldsCatalogsMap = twentyEightDayAboveSoldsCatalogs.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
         List<CatalogAgingModel> catalogAgingModels = ageingService.getCatalogsAgingByWarehouse(catalogIds, fofoStore.getWarehouseId());
         Map<Integer, CatalogAgingModel> catalogAgingModelMap = catalogAgingModels.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
                         (v1, v2) -> v1,
                         LinkedHashMap::new // Maintain order of brands
                 ));
         model.addAttribute("brandStatusWiseStockListMap", sortedBrandStatusWiseStockListMap);
-        model.addAttribute("sevenDayAboveSoldsCatalogsMap", sevenDayAboveSoldsCatalogsMap);
+        model.addAttribute("brands", finalSortedBrands);
-        model.addAttribute("fourteenDayAboveSoldsCatalogsMap", fourteenDayAboveSoldsCatalogsMap);
-        model.addAttribute("twentyOneDayAboveSoldsCatalogsMap", twentyOneDayAboveSoldsCatalogsMap);
-        model.addAttribute("twentyEightDayAboveSoldsCatalogsMap", twentyEightDayAboveSoldsCatalogsMap);
-        model.addAttribute("brands", sortedBrands);
+        model.addAttribute("brandToMtdMap", brandToMtdMap);
         model.addAttribute("brand", brand);
         model.addAttribute("fofoId", fofoId);
         model.addAttribute("customRetailer", customRetailer);
         model.addAttribute("shortInvest", shortInvest);
         model.addAttribute("purchaseMtd", purchaseMtd);
         model.addAttribute("saleMtd", saleMtd);
         model.addAttribute("purchaseTargetFtd", purchaseTargetFtd);
         model.addAttribute("recoverableAmount", recoverableAmount);
         model.addAttribute("isLoanPending", isLoanPending);
         model.addAttribute("totalAvailableFunds", totalAvailableFunds);
+        model.addAttribute("sdCreditRequirement", sdCreditRequirement);
+        model.addAttribute("userWallet", userWallet);
+        model.addAttribute("monthlyTarget", monthlyTarget);
+        model.addAttribute("totalPendingAmount", totalPendingAmount);
+        model.addAttribute("sevenDayAboveSoldsCatalogs", sevenDayAboveSoldsCatalogs);
+        model.addAttribute("fourteenDayAboveSoldsCatalogs", fourteenDayAboveSoldsCatalogs);
+        model.addAttribute("twentyOneDayAboveSoldsCatalogs", twentyOneDayAboveSoldsCatalogs);
+        model.addAttribute("twentyEightDayAboveSoldsCatalogs", twentyEightDayAboveSoldsCatalogs);
         return "partner-stock";
+    }
     private List<PartnerStockDescriptionModel> getBrandItemwiseDescription(String brand,

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java – Rev 34397 → 34412