Subversion Repositories SmartDukaan

Rev

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

Rev 34781 Rev 34813
Line 634... Line 634...
634 
    @RequestMapping(value = "/partnerTotalIncomeByMonth/{yearMonth}", method = RequestMethod.GET)
 634 
    @RequestMapping(value = "/partnerTotalIncomeByMonth/{yearMonth}", method = RequestMethod.GET)
635 
    public String getPartnerTotalIncomeByMonth(HttpServletRequest request, @PathVariable int yearMonth, Model model) throws
 635 
    public String getPartnerTotalIncomeByMonth(HttpServletRequest request, @PathVariable int yearMonth, Model model) throws
636 
            Exception {
 636 
            Exception {
637 
 
 637 
 
638 
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 638 
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
- 
 
 639 
        Map<String, Object> data = retailerService
- 
 
 640 
                .computeIncomeMap(loginDetails.getFofoId(), yearMonth);
639 
        long pendingIncome = 0;
 641 
//        long pendingIncome = 0;
640 
        long partnerPurchaseIn = 0;
 642 
//        long partnerPurchaseIn = 0;
641 
        long partnerCreditedSale = 0;
 643 
//        long partnerCreditedSale = 0;
642 
        long partnerFrontIncome = 0;
 644 
//        long partnerFrontIncome = 0;
643 
 
 645 
//
644 
        LocalDateTime startOfMonth = LocalDate.now().minusMonths(yearMonth).withDayOfMonth(1).atStartOfDay();
 646 
//        LocalDateTime startOfMonth = LocalDate.now().minusMonths(yearMonth).withDayOfMonth(1).atStartOfDay();
645 
        LocalDateTime endOfMonth = startOfMonth.plusMonths(1).toLocalDate().atStartOfDay();
 647 
//        LocalDateTime endOfMonth = startOfMonth.plusMonths(1).toLocalDate().atStartOfDay();
646 
 
 648 
//
647 
        AllPurchaseInventoryModel partnerlPendingSaleAmount = schemeInOutRepository.selectAllPendingSaleInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
 649 
//        AllPurchaseInventoryModel partnerlPendingSaleAmount = schemeInOutRepository.selectAllPendingSaleInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
648 
        AllPurchaseInventoryModel partnerCreditedSaleAmount = schemeInOutRepository.selectAllCreditedSaleInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
 650 
//        AllPurchaseInventoryModel partnerCreditedSaleAmount = schemeInOutRepository.selectAllCreditedSaleInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
649 
        AllPurchaseInventoryModel partnerPurchaseInAmount = schemeInOutRepository.selectAllPurchaseInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
 651 
//        AllPurchaseInventoryModel partnerPurchaseInAmount = schemeInOutRepository.selectAllPurchaseInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
650 
 
 652 
//
651 
        AllPurchaseInventoryModel partnerFrontIncomes = schemeInOutRepository.selectFrontIncomeByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
 653 
//        AllPurchaseInventoryModel partnerFrontIncomes = schemeInOutRepository.selectFrontIncomeByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
652 
 
 654 
//
653 
        List<OfferPayoutImeiIncomeModel> offerPayoutImeiIncomeModels = offerPayoutRepository.getTotalPayoutsByPartnerPeriod(YearMonth.of(startOfMonth.getYear(), startOfMonth.getMonth()), loginDetails.getFofoId(), null, null);
 655 
//        List<OfferPayoutImeiIncomeModel> offerPayoutImeiIncomeModels = offerPayoutRepository.getTotalPayoutsByPartnerPeriod(YearMonth.of(startOfMonth.getYear(), startOfMonth.getMonth()), loginDetails.getFofoId(), null, null);
654 
 
 656 
//
655 
        long additionalIncome = offerPayoutImeiIncomeModels.stream().collect(Collectors.summingDouble(x -> x.getSalePayout() + x.getPurchasePayout())).longValue();
 657 
//        long additionalIncome = offerPayoutImeiIncomeModels.stream().collect(Collectors.summingDouble(x -> x.getSalePayout() + x.getPurchasePayout())).longValue();
656 
        // AllPurchaseInventoryModel partnerAdditionalIncome =
 658 
//        // AllPurchaseInventoryModel partnerAdditionalIncome =
657 
        // offerRepository.selectPurchaseIncome(loginDetails.getFofoId(), startOfMonth,
 659 
//        // offerRepository.selectPurchaseIncome(loginDetails.getFofoId(), startOfMonth,
658 
        // endOfMonth);
 660 
//        // endOfMonth);
659 
 
 661 
//
660 
        LOGGER.info("partnerfrontIncomes" + partnerFrontIncomes);
 662 
//        LOGGER.info("partnerfrontIncomes" + partnerFrontIncomes);
661 
 
 663 
//
662 
        LOGGER.info("partnerCreditedSaleAmount" + partnerCreditedSaleAmount);
 664 
//        LOGGER.info("partnerCreditedSaleAmount" + partnerCreditedSaleAmount);
663 
        LOGGER.info("partnerPurchaseInAmount" + partnerPurchaseInAmount);
 665 
//        LOGGER.info("partnerPurchaseInAmount" + partnerPurchaseInAmount);
664 
        LOGGER.info("partnerlPendingSaleAmount" + partnerlPendingSaleAmount);
 666 
//        LOGGER.info("partnerlPendingSaleAmount" + partnerlPendingSaleAmount);
665 
 
 667 
//
666 
        if (partnerlPendingSaleAmount != null) {
 668 
//        if (partnerlPendingSaleAmount != null) {
667 
 
 669 
//
668 
            pendingIncome = partnerlPendingSaleAmount.getAmount();
 670 
//            pendingIncome = partnerlPendingSaleAmount.getAmount();
669 
 
 671 
//
670 
            LOGGER.info("pendingIncome" + pendingIncome);
 672 
//            LOGGER.info("pendingIncome" + pendingIncome);
671 
 
 673 
//
672 
        }
 674 
//        }
673 
 
 675 
//
674 
        if (partnerCreditedSaleAmount != null) {
 676 
//        if (partnerCreditedSaleAmount != null) {
675 
 
 677 
//
676 
            partnerCreditedSale = partnerCreditedSaleAmount.getAmount();
 678 
//            partnerCreditedSale = partnerCreditedSaleAmount.getAmount();
677 
 
 679 
//
678 
            LOGGER.info("partnerCreditedSale" + partnerCreditedSale);
 680 
//            LOGGER.info("partnerCreditedSale" + partnerCreditedSale);
679 
 
 681 
//
680 
        }
 682 
//        }
681 
        if (partnerFrontIncomes != null) {
 683 
//        if (partnerFrontIncomes != null) {
682 
 
 684 
//
683 
            partnerFrontIncome = partnerFrontIncomes.getAmount();
 685 
//            partnerFrontIncome = partnerFrontIncomes.getAmount();
684 
            LOGGER.info("partnerPurchaseIn" + partnerPurchaseIn);
 686 
//            LOGGER.info("partnerPurchaseIn" + partnerPurchaseIn);
685 
 
 687 
//
686 
        }
 688 
//        }
687 
        if (partnerPurchaseInAmount != null) {
 689 
//        if (partnerPurchaseInAmount != null) {
688 
 
 690 
//
689 
            partnerPurchaseIn = partnerPurchaseInAmount.getAmount();
 691 
//            partnerPurchaseIn = partnerPurchaseInAmount.getAmount();
690 
            LOGGER.info("partnerPurchaseIn" + partnerPurchaseIn);
 692 
//            LOGGER.info("partnerPurchaseIn" + partnerPurchaseIn);
691 
 
 693 
//
692 
        }
 694 
//        }
693 
 
 695 
//
694 
        LOGGER.info("partnerPurchaseInTT" + partnerPurchaseIn);
 696 
//        LOGGER.info("partnerPurchaseInTT" + partnerPurchaseIn);
695 
        LOGGER.info("partnerCreditedSaleTT" + partnerCreditedSale);
 697 
//        LOGGER.info("partnerCreditedSaleTT" + partnerCreditedSale);
696 
        LOGGER.info("pendingIncomeTT" + pendingIncome);
 698 
//        LOGGER.info("pendingIncomeTT" + pendingIncome);
697 
 
 699 
//
698 
        long totalIncome = partnerCreditedSale + partnerPurchaseIn + pendingIncome + partnerFrontIncome + additionalIncome;
 700 
//        long totalIncome = partnerCreditedSale + partnerPurchaseIn + pendingIncome + partnerFrontIncome + additionalIncome;
699 
 
 701 
//
700 
        long creditedIncome = partnerCreditedSale + partnerPurchaseIn + partnerFrontIncome + additionalIncome;
 702 
//        long creditedIncome = partnerCreditedSale + partnerPurchaseIn + partnerFrontIncome + additionalIncome;
701 
 
 703 
//
702 
        long pendingTotalIncome = pendingIncome;
 704 
//        long pendingTotalIncome = pendingIncome;
703 
        LOGGER.info("totalIncome" + totalIncome);
 705 
//        LOGGER.info("totalIncome" + totalIncome);
704 
        LOGGER.info("creditedIncome" + creditedIncome);
 706 
//        LOGGER.info("creditedIncome" + creditedIncome);
705 
        LOGGER.info("pendingTotalIncome" + pendingTotalIncome);
 707 
//        LOGGER.info("pendingTotalIncome" + pendingTotalIncome);
706 
 
 708 
//
707 
        model.addAttribute("totalIncome", totalIncome);
 709 
        model.addAttribute("totalIncome", data.get("totalIncome"));
708 
        model.addAttribute("creditedIncome", creditedIncome);
 710 
        model.addAttribute("creditedIncome", data.get("creditedIncome"));
709 
        model.addAttribute("pendingTotalIncome", pendingTotalIncome);
 711 
        model.addAttribute("pendingTotalIncome", data.get("pendingIncome"));
710 
 
 712 
//
711 
        Map<Integer, String> monthValueMap = new HashMap<>();
 713 
//        Map<Integer, String> monthValueMap = new HashMap<>();
712 
        for (int i = 0; i <= 5; i++) {
 714 
//        for (int i = 0; i <= 5; i++) {
713 
            LocalDateTime monthStart = LocalDateTime.now().withDayOfMonth(1).minusMonths(i);
 715 
//            LocalDateTime monthStart = LocalDateTime.now().withDayOfMonth(1).minusMonths(i);
714 
            monthValueMap.put(i, monthStart.format(DateTimeFormatter.ofPattern("MMM''uu")));
 716 
//            monthValueMap.put(i, monthStart.format(DateTimeFormatter.ofPattern("MMM''uu")));
715 
        }
 717 
//        }
716 
 
 718 
//
717 
        model.addAttribute("month", yearMonth);
 719 
        model.addAttribute("month", data.get("monthIndex"));
718 
        model.addAttribute("monthValueMap", monthValueMap);
 720 
        model.addAttribute("monthValueMap", data.get("monthValueMap"));
719 
 
 - 
 
- 
 
 721 
        LOGGER.info("income data", data);
- 
 
 722 
        model.addAttribute("data", data);
720 
        return "partner-total-income";
 723 
        return "partner-total-income";
721 
    }
 724 
    }
722 
 
 725 
 
723 
    @RequestMapping(value = "/getMonthsInvestment", method = RequestMethod.GET)
 726 
    @RequestMapping(value = "/getMonthsInvestment", method = RequestMethod.GET)
724 
    public String getMonthsInvestment(HttpServletRequest request,
 727 
    public String getMonthsInvestment(HttpServletRequest request,