Subversion Repositories SmartDukaan

Rev

Rev 32439 | Rev 32455 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 32439 Rev 32442
Line 463... Line 463...
463 
 
 463 
 
464 
        List<Order> allOrders = orderRepository.selectHoldOrder();
 464 
        List<Order> allOrders = orderRepository.selectHoldOrder();
465 
 
 465 
 
466 
        List<SanctionRequest> sanctionRequests = sanctionRequestRepository.selectHoldSanction();
 466 
        List<SanctionRequest> sanctionRequests = sanctionRequestRepository.selectHoldSanction();
467 
 
 467 
 
- 
 
 468 
 
- 
 
 469 
        Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
468 
        if (!allOrders.isEmpty()) {
 470 
        if (!allOrders.isEmpty()) {
469 
            Map<Integer, Double> transactionAmountMap = allOrders.stream().collect(
 471 
            Map<Integer, Double> transactionAmountMap = allOrders.stream().collect(
470 
                    Collectors.groupingBy(Order::getTransactionId, Collectors.summingDouble(x -> x.getTotalAmount())));
 472 
                    Collectors.groupingBy(Order::getTransactionId, Collectors.summingDouble(x -> x.getTotalAmount())));
471 
 
 473 
 
472 
            Map<Integer, List<Order>> transactionOrdersMap = allOrders.stream().collect(Collectors.groupingBy(Order::getTransactionId, Collectors.toList()));
 474 
            Map<Integer, List<Order>> transactionOrdersMap = allOrders.stream().collect(Collectors.groupingBy(Order::getTransactionId, Collectors.toList()));
Line 477... Line 479...
477 
            model.addAttribute("transactionOrdersMap", transactionOrdersMap);
 479 
            model.addAttribute("transactionOrdersMap", transactionOrdersMap);
478 
 
 480 
 
479 
        }
 481 
        }
480 
        model.addAttribute("sanctionRequests", sanctionRequests);
 482 
        model.addAttribute("sanctionRequests", sanctionRequests);
481 
 
 483 
 
- 
 
 484 
        model.addAttribute("customRetailerMap", customRetailerMap);
- 
 
 485 
 
482 
 
 486 
 
483 
        return "sanction-order-unhold";
 487 
        return "sanction-order-unhold";
484 
 
 488 
 
485 
    }
 489 
    }
486 
 
 490 
 
Line 489... Line 493...
489 
    public String getSanctionHoldOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
 493 
    public String getSanctionHoldOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
490 
 
 494 
 
491 
        List<Order> allOrders = orderRepository.selectHoldOrder();
 495 
        List<Order> allOrders = orderRepository.selectHoldOrder();
492 
 
 496 
 
493 
        List<SanctionRequest> sanctionRequests = sanctionRequestRepository.selectHoldSanction();
 497 
        List<SanctionRequest> sanctionRequests = sanctionRequestRepository.selectHoldSanction();
- 
 
 498 
        Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
494 
 
 499 
 
495 
        if (!allOrders.isEmpty()) {
 500 
        if (!allOrders.isEmpty()) {
496 
            Map<Integer, Double> transactionAmountMap = allOrders.stream().collect(
 501 
            Map<Integer, Double> transactionAmountMap = allOrders.stream().collect(
497 
                    Collectors.groupingBy(Order::getTransactionId, Collectors.summingDouble(x -> x.getTotalAmount())));
 502 
                    Collectors.groupingBy(Order::getTransactionId, Collectors.summingDouble(x -> x.getTotalAmount())));
498 
 
 503 
 
Line 503... Line 508...
503 
 
 508 
 
504 
            model.addAttribute("transactionOrdersMap", transactionOrdersMap);
 509 
            model.addAttribute("transactionOrdersMap", transactionOrdersMap);
505 
 
 510 
 
506 
        }
 511 
        }
507 
        model.addAttribute("sanctionRequests", sanctionRequests);
 512 
        model.addAttribute("sanctionRequests", sanctionRequests);
- 
 
 513 
        model.addAttribute("customRetailerMap", customRetailerMap);
508 
 
 514 
 
509 
 
 515 
 
510 
        return "sanction-order-hold";
 516 
        return "sanction-order-hold";
511 
 
 517 
 
512 
    }
 518 
    }