Subversion Repositories SmartDukaan

Rev

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

Rev 31969 Rev 31987
Line 584... Line 584...
584
    private float createSchemeInOut(List<SchemeSummaryModel> schemeSummaryModels, InventoryItem inventoryItem, PartnerType partnerType) throws ProfitMandiBusinessException {
584
    private float createSchemeInOut(List<SchemeSummaryModel> schemeSummaryModels, InventoryItem inventoryItem, PartnerType partnerType) throws ProfitMandiBusinessException {
585
 
585
 
586
        InventoryPayoutModel inventoryPayoutModel = priceCircularService.getPayouts(inventoryItem);
586
        InventoryPayoutModel inventoryPayoutModel = priceCircularService.getPayouts(inventoryItem);
587
        //Get all schemes
587
        //Get all schemes
588
        List<SchemeSummaryModel> inventoryPayoutModelToProcess = schemeSummaryModels.stream().filter(x -> x.isProcess()).collect(Collectors.toList());
588
        List<SchemeSummaryModel> inventoryPayoutModelToProcess = schemeSummaryModels.stream().filter(x -> x.isProcess()).collect(Collectors.toList());
589
        float actualCredit = 0;
-
 
590
 
589
 
591
        List<SchemeInOut> sios = inventoryPayoutModel.getSchemePayouts();
590
        List<SchemeInOut> sios = inventoryPayoutModel.getSchemePayouts();
592
        Map<SchemeType, List<SchemeInOut>> paidSchemeTypesMap = inventoryPayoutModel.getSchemePayouts().stream().collect(Collectors.groupingBy(x -> x.getScheme().getType()));
591
        Map<SchemeType, List<SchemeInOut>> paidSchemeTypesMap = inventoryPayoutModel.getSchemePayouts().stream().collect(Collectors.groupingBy(x -> x.getScheme().getType()));
593
        Map<Integer, SchemeInOut> paidSchemesMap = sios.stream().collect(Collectors.toMap(x -> x.getSchemeId(), x -> x));
592
        Map<Integer, SchemeInOut> paidSchemesMap = sios.stream().collect(Collectors.toMap(x -> x.getSchemeId(), x -> x));
594
 
593
 
Line 663... Line 662...
663
            }
662
            }
664
            walletCredit += fixedRollout;
663
            walletCredit += fixedRollout;
665
        }
664
        }
666
 
665
 
667
        if (percentageToPay > 0) {
666
        if (percentageToPay > 0) {
-
 
667
            LOGGER.info("inventoryPayoutModel.getFixedAmount() ----> {}", inventoryPayoutModel.getFixedAmount());
668
            double effectiveDP = inventoryPayoutModel.getDp() - (inventoryPayoutModel.getFixedAmount() + fixedToPay);
668
            double effectiveDP = inventoryPayoutModel.getDp() - (inventoryPayoutModel.getFixedAmount() + fixedToPay);
669
            double totalPercentage = inventoryPayoutModel.getPercentageAmount() + percentageToPay;
669
            double totalPercentage = inventoryPayoutModel.getPercentageAmount() + percentageToPay;
670
            double percentageRollout = effectiveDP * (totalPercentage / (100 + totalPercentage) - (inventoryPayoutModel.getPercentageAmount() / (100 + inventoryPayoutModel.getPercentageAmount())));
670
            double percentageRollout = effectiveDP * (totalPercentage / (100 + totalPercentage) - (inventoryPayoutModel.getPercentageAmount() / (100 + inventoryPayoutModel.getPercentageAmount())));
671
            for (Map.Entry<SchemeSummaryModel, AmountModel> schemeSummaryModelAmountModelEntry : payoutSchemeSummaryModelMap.entrySet()) {
671
            for (Map.Entry<SchemeSummaryModel, AmountModel> schemeSummaryModelAmountModelEntry : payoutSchemeSummaryModelMap.entrySet()) {
672
                SchemeSummaryModel schemeSummaryModel = schemeSummaryModelAmountModelEntry.getKey();
672
                SchemeSummaryModel schemeSummaryModel = schemeSummaryModelAmountModelEntry.getKey();