Subversion Repositories SmartDukaan

Rev

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

Rev 34709 Rev 34740
Line 810... Line 810...
810
 
810
 
811
                List<InventoryItem> modelInventoryItems = catalogInventoryItemMap.get(catalogSummaryModel.getCatalogId());
811
                List<InventoryItem> modelInventoryItems = catalogInventoryItemMap.get(catalogSummaryModel.getCatalogId());
812
                for (InventoryItem inventoryItem : modelInventoryItems) {
812
                for (InventoryItem inventoryItem : modelInventoryItems) {
813
                    Map<Integer, SchemeSummaryModel> schemeSummaryModelMap = schemeSummaryModels.stream().collect(Collectors.toMap(x -> x.getSchemeId(), x -> x));
813
                    Map<Integer, SchemeSummaryModel> schemeSummaryModelMap = schemeSummaryModels.stream().collect(Collectors.toMap(x -> x.getSchemeId(), x -> x));
814
                    List<SchemeInOut> sios = schemeInOutRepository.selectAll(inventoryItem.getId());
814
                    List<SchemeInOut> sios = schemeInOutRepository.selectAll(inventoryItem.getId());
-
 
815
 
815
                    List<Integer> creditedSchemeIds = sios.stream()
816
                    List<Integer> creditedSchemeIds = sios.stream()
816
                            .filter(x -> x.getStatus().equals(SchemePayoutStatus.CREDITED))
817
                            .filter(x -> x.getStatus().equals(SchemePayoutStatus.CREDITED))
817
                            .map(x -> x.getSchemeId()).collect(Collectors.toList());
818
                            .map(x -> x.getSchemeId()).collect(Collectors.toList());
818
                    List<Integer> schemeIdsToReject = schemeRepository.selectBySchemeIds(creditedSchemeIds).stream().filter(x -> SchemeType.OUT_TYPES.contains(x.getType())).map(x -> x.getId()).collect(Collectors.toList());
-
 
819
 
819
 
-
 
820
                    if (creditedSchemeIds.size() > 0) {
-
 
821
                        List<Integer> schemeIdsToReject = schemeRepository.selectBySchemeIds(creditedSchemeIds).stream()
-
 
822
                                .filter(x -> SchemeType.OUT_TYPES.contains(x.getType())).map(x -> x.getId()).collect(Collectors.toList());
820
                    //Reject invalid scheme payouts due to upgrade in Category or any change in schemes historically
823
                        //Reject invalid scheme payouts due to upgrade in Category or any change in schemes historically
821
                    for (SchemeInOut sio : sios) {
824
                        for (SchemeInOut sio : sios) {
822
                        if (schemeIdsToReject.contains(sio.getSchemeId()) && !schemeSummaryModelMap.containsKey(sio.getSchemeId())) {
825
                            if (schemeIdsToReject.contains(sio.getSchemeId()) && !schemeSummaryModelMap.containsKey(sio.getSchemeId())) {
823
                            sio.setStatusDescription("Rolledback due to Category upgrade/invalid scheme");
826
                                sio.setStatusDescription("Rolledback due to Category upgrade/invalid scheme");
824
                            sio.setStatus(SchemePayoutStatus.REJECTED);
827
                                sio.setStatus(SchemePayoutStatus.REJECTED);
825
                            sio.setRolledBackTimestamp(LocalDateTime.now());
828
                                sio.setRolledBackTimestamp(LocalDateTime.now());
826
                            totalCashback -= sio.getAmount();
829
                                totalCashback -= sio.getAmount();
-
 
830
                            }
827
                        }
831
                        }
828
                    }
832
                    }
829
                    float inventoryItemCashback = this.createSchemeInOut(schemeSummaryModels, inventoryItem);
833
                    float inventoryItemCashback = this.createSchemeInOut(schemeSummaryModels, inventoryItem);
830
                    if (inventoryItemCashback > 0) {
834
                    if (inventoryItemCashback > 0) {
831
                        count++;
835
                        count++;