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

         return "reset-irn-panel";
+    }
     @GetMapping("/getTransactionForIrnReset")
     public String getTransactionForIrnReset(@RequestParam String invoiceNumber, Model model) throws Exception {
-        List<String> invoiceNumbers = Arrays.asList(invoiceNumber.split(","));
+        List<String> invoiceNumbers = splitInvoiceNumbers(invoiceNumber);
-        List<EInvoiceDetails> eInvoiceDetailsList = eInvoiceDetailsRepository.selectByInvoiceNumbers(invoiceNumbers);
+        // A failed filing also leaves an einvoice_details row (irn NULL, irn_error_message set), so
-        if (invoiceNumbers.size() == eInvoiceDetailsList.size()) {
+        // only a row carrying an IRN means the invoice is already filed. Treating every row as filed
-            model.addAttribute("irnResetOrderModelList", new ArrayList<>());
+        // blocked exactly the failed invoices this panel exists to reset.
-            model.addAttribute("notEligibleInvoiceNumbers", invoiceNumber);
+        Set<String> irnFiledInvoices = eInvoiceDetailsRepository.selectByInvoiceNumbers(invoiceNumbers).stream()
-            return "eligible-irn-reset-orders";
+                .filter(x -> x.getIrn() != null)
-        }
-        Set<String> existingInvoiceInEInvoiceDtl = eInvoiceDetailsList.stream().map(x -> x.getInvoiceNumber()).collect(Collectors.toSet());
+                .map(EInvoiceDetails::getInvoiceNumber)
-        List<String> missingInvoiceInEInvoiceDtl = invoiceNumbers.stream().filter(x -> !existingInvoiceInEInvoiceDtl.contains(x)).collect(Collectors.toList());
+                .collect(Collectors.toSet());
-        List<Order> orderList = orderRepository.selectByInvoiceNumbers(missingInvoiceInEInvoiceDtl).stream().filter(x -> x.getIrnGenerated() != null).collect(Collectors.toList());
+        Map<String, List<Order>> invoiceMap = orderRepository.selectByInvoiceNumbers(invoiceNumbers).stream()
-        Map<String, List<Order>> invoiceMap = orderList.stream().collect(Collectors.groupingBy(x -> x.getInvoiceNumber()));
+                .collect(Collectors.groupingBy(Order::getInvoiceNumber));
-        Set<String> notEligibleInvoiceNumbers = new HashSet<>();
+        LocalDate earlierDate = LocalDate.now().minusDays(5);
-        notEligibleInvoiceNumbers.addAll(existingInvoiceInEInvoiceDtl);
+        Map<String, String> notEligibleInvoices = new LinkedHashMap<>();
         List<IrnResetOrderModel> irnResetOrderModelList = new ArrayList<>();
-        for (Map.Entry<String, List<Order>> invoiceMapEntry : invoiceMap.entrySet()) {
+        for (String invoice : invoiceNumbers) {
-            String invoice = invoiceMapEntry.getKey();
+            List<Order> orders = invoiceMap.get(invoice);
+            if (orders == null) {
-            List<Order> orders = invoiceMapEntry.getValue();
+                notEligibleInvoices.put(invoice, "invoice not found");
-            LocalDate earlierDate = LocalDate.now().minusDays(5);
+            } else if (irnFiledInvoices.contains(invoice)) {
+                notEligibleInvoices.put(invoice, "IRN already generated");
+            } else if (orders.stream().anyMatch(x -> x.getIrnGenerated() == null)) {
+                notEligibleInvoices.put(invoice, "already queued for IRN generation");
-            boolean isEligible = !orders.isEmpty() && orders.stream().allMatch(x -> x.getBillingTimestamp().toLocalDate().isAfter(earlierDate) && x.getIrnGenerated() != null);
+            } else if (!orders.stream().allMatch(x -> x.getBillingTimestamp().toLocalDate().isAfter(earlierDate))) {
+                notEligibleInvoices.put(invoice, "billed more than five days ago");
-            if (isEligible) {
+            } else {
                 Order order = orders.get(0);
                 FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(order.getRetailerId());
                 IrnResetOrderModel irnResetOrderModel = new IrnResetOrderModel();
                 irnResetOrderModel.setName(partnerOnBoardingPanelRepository.selectByCode(fofoStore.getCode()).getOutLetName());
                 irnResetOrderModel.setInvoiceNumber(order.getInvoiceNumber());
                 irnResetOrderModel.setInvoiceDate(order.getBillingTimestamp());
                 irnResetOrderModel.setWarehouseId(ProfitMandiConstants.WAREHOUSE_MAP.get(order.getWarehouseId()));
                 irnResetOrderModel.setTotalOrderValue(orders.stream().mapToDouble(Order::getTotalAmount).sum());
                 irnResetOrderModelList.add(irnResetOrderModel);
-            } else {
-                notEligibleInvoiceNumbers.add(invoice);
+            }
+        }
         model.addAttribute("irnResetOrderModelList", irnResetOrderModelList);
-        model.addAttribute("notEligibleInvoiceNumbers", notEligibleInvoiceNumbers.stream().collect(Collectors.joining(", ")));
+        model.addAttribute("notEligibleInvoices", notEligibleInvoices);
         return "eligible-irn-reset-orders";
+    }
+    // The panel joins with ", " — untrimmed, every invoice after the first matched no order.
+    private static List<String> splitInvoiceNumbers(String invoiceNumbers) {
+        return Arrays.stream(invoiceNumbers.split(","))
+                .map(String::trim)
+                .filter(x -> !x.isEmpty())
+                .distinct()
+                .collect(Collectors.toList());
+    }
     @PutMapping("/resetOrdersIrn")
     public String resetIrn(@RequestParam String invoiceNumbers, Model model) throws Exception {
-        List<String> invoices = new ArrayList<>();
+        List<String> invoices = splitInvoiceNumbers(invoiceNumbers);
-        if (!invoiceNumbers.isEmpty()) {
-            invoices = Arrays.asList(invoiceNumbers.split(","));
-        }
         List<Order> orderList = orderRepository.selectByInvoiceNumbers(invoices);
         orderList.forEach(order -> {
             order.setIrnGenerated(null);
         });
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));

Subversion Repositories SmartDukaan

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