| Line 593... |
Line 593... |
| 593 |
|
593 |
|
| 594 |
|
594 |
|
| 595 |
@Autowired
|
595 |
@Autowired
|
| 596 |
OfferRepository offerRepository;
|
596 |
OfferRepository offerRepository;
|
| 597 |
|
597 |
|
| - |
|
598 |
@Autowired
|
| - |
|
599 |
OfferPayoutRepository offerPayoutRepository;
|
| - |
|
600 |
|
| 598 |
@RequestMapping(value = "/partnerTotalIncomeByMonth/{yearMonth}", method = RequestMethod.GET)
|
601 |
@RequestMapping(value = "/partnerTotalIncomeByMonth/{yearMonth}", method = RequestMethod.GET)
|
| 599 |
public String getPartnerTotalIncomeByMonth(HttpServletRequest request, @PathVariable int yearMonth, Model model)
|
602 |
public String getPartnerTotalIncomeByMonth(HttpServletRequest request, @PathVariable int yearMonth, Model model)
|
| 600 |
throws Exception {
|
603 |
throws Exception {
|
| 601 |
|
604 |
|
| 602 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
605 |
LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
|
| Line 616... |
Line 619... |
| 616 |
.selectAllPurchaseInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
619 |
.selectAllPurchaseInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
| 617 |
|
620 |
|
| 618 |
AllPurchaseInventoryModel partnerFrontIncomes = schemeInOutRepository
|
621 |
AllPurchaseInventoryModel partnerFrontIncomes = schemeInOutRepository
|
| 619 |
.selectFrontIncomeByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
622 |
.selectFrontIncomeByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
| 620 |
|
623 |
|
| - |
|
624 |
List<OfferPayoutImeiIncomeModel> offerPayoutImeiIncomeModels = offerPayoutRepository.getTotalPayoutsByPartnerPeriod(
|
| - |
|
625 |
YearMonth.of(startOfMonth.getYear(), startOfMonth.getMonth()), loginDetails.getFofoId(), null, null);
|
| - |
|
626 |
|
| - |
|
627 |
long additionalIncome = offerPayoutImeiIncomeModels.stream().collect(Collectors.summingDouble(x -> x.getSalePayout() + x.getPurchasePayout())).longValue();
|
| 621 |
//AllPurchaseInventoryModel partnerAdditionalIncome = offerRepository.selectPurchaseIncome(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
628 |
//AllPurchaseInventoryModel partnerAdditionalIncome = offerRepository.selectPurchaseIncome(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
| 622 |
|
629 |
|
| 623 |
LOGGER.info("partnerfrontIncomes" + partnerFrontIncomes);
|
630 |
LOGGER.info("partnerfrontIncomes" + partnerFrontIncomes);
|
| 624 |
|
631 |
|
| 625 |
LOGGER.info("partnerCreditedSaleAmount" + partnerCreditedSaleAmount);
|
632 |
LOGGER.info("partnerCreditedSaleAmount" + partnerCreditedSaleAmount);
|
| Line 656... |
Line 663... |
| 656 |
|
663 |
|
| 657 |
LOGGER.info("partnerPurchaseInTT" + partnerPurchaseIn);
|
664 |
LOGGER.info("partnerPurchaseInTT" + partnerPurchaseIn);
|
| 658 |
LOGGER.info("partnerCreditedSaleTT" + partnerCreditedSale);
|
665 |
LOGGER.info("partnerCreditedSaleTT" + partnerCreditedSale);
|
| 659 |
LOGGER.info("pendingIncomeTT" + pendingIncome);
|
666 |
LOGGER.info("pendingIncomeTT" + pendingIncome);
|
| 660 |
|
667 |
|
| 661 |
long totalIncome = partnerCreditedSale + partnerPurchaseIn + pendingIncome + partnerFrontIncome;
|
668 |
long totalIncome = partnerCreditedSale + partnerPurchaseIn + pendingIncome + partnerFrontIncome + additionalIncome;
|
| 662 |
|
669 |
|
| 663 |
long creditedIncome = partnerCreditedSale + partnerPurchaseIn + partnerFrontIncome;
|
670 |
long creditedIncome = partnerCreditedSale + partnerPurchaseIn + partnerFrontIncome + additionalIncome;
|
| 664 |
|
671 |
|
| 665 |
long pendingTotalIncome = pendingIncome;
|
672 |
long pendingTotalIncome = pendingIncome;
|
| 666 |
LOGGER.info("totalIncome" + totalIncome);
|
673 |
LOGGER.info("totalIncome" + totalIncome);
|
| 667 |
LOGGER.info("creditedIncome" + creditedIncome);
|
674 |
LOGGER.info("creditedIncome" + creditedIncome);
|
| 668 |
LOGGER.info("pendingTotalIncome" + pendingTotalIncome);
|
675 |
LOGGER.info("pendingTotalIncome" + pendingTotalIncome);
|