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

 @Transactional(rollbackOn = Throwable.class)
 public class SDCreditController {
     @Autowired
     private RetailerService retailerService;
     @Autowired
     private UserService userService;
     @Autowired
     SDCreditRequirementRepository sdCreditRequirementRepository;
         model.addAttribute("loanCountMap", loanCountMap);
         model.addAttribute("customRetailerMap", customRetailerMap);
         return "loan-summary";
+    }
     @RequestMapping(value = "/getPartnerWiseLoanSummary", method = RequestMethod.GET)
     public String getPartnerWiseLoanSummary(HttpServletRequest request, @RequestParam LoanSummaryType loanSummaryType, Model model) throws ProfitMandiBusinessException {
         Map<Integer, FofoReportingModel> fofoReportingModelMap = csService.getPartnerIdSalesHeaders();
         List<Loan> loans = new ArrayList<>();
         List<Loan> activeLoans = loanRepository.selectAllActiveLoan();
                 if (noOfdaysBetween <= 15 && noOfdaysBetween >= 0) {
                     loans.add(loan);
+                }
+            }
+        }
-        List<Integer> fofoIds =  loans.stream().map(x -> x.getFofoId()).collect(Collectors.toList());
+        List<Integer> fofoIds = loans.stream().map(x -> x.getFofoId()).collect(Collectors.toList());
-        Map<Integer, Double> fofoIdLoansMap = loans.stream().collect(Collectors.groupingBy(x -> x.getFofoId(),Collectors.summingDouble(x->x.getPendingAmount().doubleValue())));
+        Map<Integer, Double> fofoIdLoansMap = loans.stream().collect(Collectors.groupingBy(x -> x.getFofoId(), Collectors.summingDouble(x -> x.getPendingAmount().doubleValue())));
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(fofoIds);
         model.addAttribute("customRetailerMap", customRetailerMap);
         model.addAttribute("loans", loans);
         model.addAttribute("fofoReportingModelMap", fofoReportingModelMap);
         model.addAttribute("fofoIdLoansMap", fofoIdLoansMap);
         return "loan-summary-detail";
+    }
-    @RequestMapping(value = "/getSanctionHoldOrder", method = RequestMethod.GET)
+    @RequestMapping(value = "/getSanctionUnholdOrder", method = RequestMethod.GET)
-    public String getSanctionHoldOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
+    public String getSanctionUnholdOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
         List<Order> allOrders = orderRepository.selectHoldOrder();
-        LOGGER.info("allOrders {}", allOrders);
+        List<SanctionRequest> sanctionRequests = sanctionRequestRepository.selectHoldSanction();
         if (!allOrders.isEmpty()) {
             Map<Integer, Double> transactionAmountMap = allOrders.stream().collect(
                     Collectors.groupingBy(Order::getTransactionId, Collectors.summingDouble(x -> x.getTotalAmount())));
             Map<Integer, List<Order>> transactionOrdersMap = allOrders.stream().collect(Collectors.groupingBy(Order::getTransactionId, Collectors.toList()));
-            List<SanctionRequest> sanctionRequests = sanctionRequestRepository.selectByTransactionId(new ArrayList<>(transactionAmountMap.keySet()));
             model.addAttribute("transactionAmountMap", transactionAmountMap);
             model.addAttribute("transactionOrdersMap", transactionOrdersMap);
+        }
-            model.addAttribute("sanctionRequests", sanctionRequests);
+        model.addAttribute("sanctionRequests", sanctionRequests);
-            Map<Integer, Double> transactionCreditMap = new HashMap<>();
-            for (Entry<Integer, List<Order>> transactionOrderEntry : transactionOrdersMap.entrySet()) {
-                List<Order> orders = transactionOrderEntry.getValue();
+        return "sanction-order-unhold";
-                LocalDateTime createDate = orders.get(0).getCreateTimestamp();
+    }
-                int fofoId = orders.get(0).getRetailerId();
+    @RequestMapping(value = "/getSanctionHoldOrder", method = RequestMethod.GET)
-                double loanSettleAmount = loanStatementRepository.selectByDateAndFofoId(createDate, fofoId).stream().filter(x -> x.getAmount().doubleValue() > 0).collect(Collectors.summingDouble(x -> x.getAmount().doubleValue()));
+    public String getSanctionHoldOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
-                transactionCreditMap.put(transactionOrderEntry.getKey(), loanSettleAmount);
+        List<Order> allOrders = orderRepository.selectHoldOrder();
+        List<SanctionRequest> sanctionRequests = sanctionRequestRepository.selectHoldSanction();
-            }
+        if (!allOrders.isEmpty()) {
+            Map<Integer, Double> transactionAmountMap = allOrders.stream().collect(
+                    Collectors.groupingBy(Order::getTransactionId, Collectors.summingDouble(x -> x.getTotalAmount())));
+            Map<Integer, List<Order>> transactionOrdersMap = allOrders.stream().collect(Collectors.groupingBy(Order::getTransactionId, Collectors.toList()));
-            model.addAttribute("transactionCreditMap", transactionCreditMap);
+            model.addAttribute("transactionAmountMap", transactionAmountMap);
+            model.addAttribute("transactionOrdersMap", transactionOrdersMap);
+        }
+        model.addAttribute("sanctionRequests", sanctionRequests);
         return "sanction-order-hold";
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SDCreditController.java – Rev 32197 → 32439