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

         BigDecimal availableLimit = creditSummary.getAvailableLimit();
         BigDecimal creditlimit = sdCreditRequirement.getLimit();
         BigDecimal totalDue = creditSummary.getTotalDue();
         model.addAttribute("userWallet", userWallet);
         model.addAttribute("walletHistories", userWalletHistories);
+        model.addAttribute("walletAttachmentMap", buildWalletHistoryAttachmentMap(userWalletHistories));
         model.addAttribute("start", offset + 1);
         model.addAttribute("size", countItems);
         model.addAttribute("isAdmin", isAdmin);
         model.addAttribute("loans", loans);
         model.addAttribute("totalDue", totalDue);
         } catch (ProfitMandiBusinessException profitMandiBusinessException) {
             LOGGER.error("UserWallet History not found : ", profitMandiBusinessException);
+        }
         model.addAttribute("walletHistories", userWalletHistories);
+        model.addAttribute("walletAttachmentMap", buildWalletHistoryAttachmentMap(userWalletHistories));
         return "wallet-history-paginated";
+    }
     @RequestMapping(value = "/getAddWalletRequest", method = RequestMethod.GET)
     public String getAddwalletRequest(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
             Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
             model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
+            model.addAttribute("fspAttachmentMap", buildFspAttachmentMap(walletRequest));
             model.addAttribute("rStatus", "pending");
             model.addAttribute("start", offset + 1);
             model.addAttribute("size", size);
             model.addAttribute("url", "/getPaginatedWalletRequest");
             Map<Integer, CustomRetailer> fofoIdsAndRetailerName = 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("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
+            model.addAttribute("fspAttachmentMap", buildFspAttachmentMap(walletRequest));
             model.addAttribute("rStatus", "pending");
             model.addAttribute("url", "/getPaginatedWalletRequest");
         } else {
             model.addAttribute("walletRequest", walletRequest);
             Map<Integer, CustomRetailer> fofoIdsAndRetailerName = 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("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
+            model.addAttribute("fspAttachmentMap", buildFspAttachmentMap(walletRequest));
             model.addAttribute("start", offset + 1);
             model.addAttribute("size", size);
             model.addAttribute("url", "/getPaginatedWalletApproved");
             if (walletRequest.size() < limit) {
             Map<Integer, CustomRetailer> fofoIdsAndRetailerName = 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("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
+            model.addAttribute("fspAttachmentMap", buildFspAttachmentMap(walletRequest));
             model.addAttribute("url", "/getPaginatedWalletApproved");
         } else {
             model.addAttribute("walletRequest", walletRequest);
+        }
             Map<Integer, CustomRetailer> fofoIdsAndRetailerName = 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("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
+            model.addAttribute("fspAttachmentMap", buildFspAttachmentMap(walletRequest));
             model.addAttribute("start", offset + 1);
             model.addAttribute("size", size);
             model.addAttribute("url", "/getPaginatedWalletRequestRejected");
             if (walletRequest.size() < limit) {
             Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
             Map<Integer, CustomRetailer> fofoIdsAndRetailerName = 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("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
+            model.addAttribute("fspAttachmentMap", buildFspAttachmentMap(walletRequest));
             model.addAttribute("url", "/getPaginatedWalletRequestRejected");
         } else {
             model.addAttribute("walletRequest", walletRequest);
+        }
     private List<Integer> getFofoIdsFromWalletRequest(List<AddWalletRequest> walletRequest) {
         return walletRequest.stream().map(x -> x.getRetailerId()).distinct().collect(Collectors.toList());
+    }
+    /**
+     * Builds a map of AddWalletRequest.id -> FullStockPayment.attachment for requests linked to FSP.
+     */
+    private Map<Integer, Integer> buildFspAttachmentMap(List<AddWalletRequest> walletRequests) {
+        Map<Integer, Integer> attachmentMap = new HashMap<>();
+        List<Integer> fspIds = walletRequests.stream()
+                .filter(r -> r.getFspId() > 0)
+                .map(AddWalletRequest::getFspId)
+                .distinct()
+                .collect(Collectors.toList());
+        if (fspIds.isEmpty()) {
+            return attachmentMap;
+        }
+        List<FullStockPayment> fspList = fullStockPaymentRepository.selectByIds(fspIds);
+        Map<Integer, Integer> fspIdToAttachment = fspList.stream()
+                .filter(f -> f.getAttachment() > 0)
+                .collect(Collectors.toMap(FullStockPayment::getId, FullStockPayment::getAttachment));
+        for (AddWalletRequest r : walletRequests) {
+            if (r.getFspId() > 0 && fspIdToAttachment.containsKey(r.getFspId())) {
+                attachmentMap.put(r.getId(), fspIdToAttachment.get(r.getFspId()));
+            }
+        }
+        return attachmentMap;
+    }
+    /**
+     * Builds a map of UserWalletHistory.id -> FullStockPayment.attachment for ADVANCE_AMOUNT entries linked to FSP.
+     */
+    private Map<Integer, Integer> buildWalletHistoryAttachmentMap(List<UserWalletHistory> histories) {
+        Map<Integer, Integer> attachmentMap = new HashMap<>();
+        List<Integer> awrIds = histories.stream()
+                .filter(h -> h.getReferenceType() == WalletReferenceType.ADVANCE_AMOUNT && h.getReference() > 0)
+                .map(UserWalletHistory::getReference)
+                .distinct()
+                .collect(Collectors.toList());
+        if (awrIds.isEmpty()) {
+            return attachmentMap;
+        }
+        List<AddWalletRequest> awrList = addWalletRequestRepository.selectByIds(awrIds);
+        Map<Integer, Integer> awrIdToFspId = awrList.stream()
+                .filter(r -> r.getFspId() > 0)
+                .collect(Collectors.toMap(AddWalletRequest::getId, AddWalletRequest::getFspId));
+        List<Integer> fspIds = awrIdToFspId.values().stream().distinct().collect(Collectors.toList());
+        if (fspIds.isEmpty()) {
+            return attachmentMap;
+        }
+        List<FullStockPayment> fspList = fullStockPaymentRepository.selectByIds(fspIds);
+        Map<Integer, Integer> fspIdToAttachment = fspList.stream()
+                .filter(f -> f.getAttachment() > 0)
+                .collect(Collectors.toMap(FullStockPayment::getId, FullStockPayment::getAttachment));
+        for (UserWalletHistory h : histories) {
+            if (h.getReferenceType() == WalletReferenceType.ADVANCE_AMOUNT && h.getReference() > 0) {
+                Integer fspId = awrIdToFspId.get(h.getReference());
+                if (fspId != null && fspIdToAttachment.containsKey(fspId)) {
+                    attachmentMap.put(h.getId(), fspIdToAttachment.get(fspId));
+                }
+            }
+        }
+        return attachmentMap;
+    }
     @RequestMapping(value = "/getcreateUnsettledPayments", method = RequestMethod.GET)
     public String getcreateUnsettledPayment(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "15") int limit, Model model) throws Exception {
         List<UnsettledPayment> up = null;
         long size = 0;

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java – Rev 36064 → 36242