Subversion Repositories SmartDukaan

Rev

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

Rev 34802 Rev 34803
Line 822... Line 822...
822
 
822
 
823
                    double sioRejectedValue = 0;
823
                    double sioRejectedValue = 0;
824
                    if (creditedSchemeIds.size() > 0) {
824
                    if (creditedSchemeIds.size() > 0) {
825
                        //Also ignore special support
825
                        //Also ignore special support
826
                        //This code block needs to be deleted
826
                        //This code block needs to be deleted
-
 
827
                        List<Integer> schemeIdsToReject = null;
827
                        if (Arrays.asList(1025588, 1025589).contains(inventoryItem.getItem().getCatalogItemId())) {
828
                        if (Arrays.asList(1025588, 1025589).contains(inventoryItem.getItem().getCatalogItemId())) {
828
                            List<Integer> schemeIdsToReject = schemeRepository.selectBySchemeIds(creditedSchemeIds).stream()
829
                            schemeIdsToReject = schemeRepository.selectBySchemeIds(creditedSchemeIds).stream()
829
                                    .filter(x -> !SchemeType.SPECIAL_SUPPORT.equals(x.getType()))
830
                                    .filter(x -> !SchemeType.SPECIAL_SUPPORT.equals(x.getType()))
830
                                    .map(x -> x.getId()).collect(Collectors.toList());
831
                                    .map(x -> x.getId()).collect(Collectors.toList());
-
 
832
                            //List<Integer> schemeIdsToReject = schemeRepository.selectBySchemeIds(creditedSchemeIds).stream()
-
 
833
                            //This code block needs to be deleted
-
 
834
                        } else {
-
 
835
                            schemeIdsToReject = schemeRepository.selectBySchemeIds(creditedSchemeIds).stream()
-
 
836
                                    .filter(x -> SchemeType.OUT_TYPES.contains(x.getType()) && !SchemeType.SPECIAL_SUPPORT.equals(x.getType()))
-
 
837
                                    .map(x -> x.getId()).collect(Collectors.toList());
-
 
838
                            //Reject invalid scheme payouts due to upgrade in Category or any change in schemes historically
-
 
839
                            //Lets not touchs
831
                        }
840
                        }
832
                        //This code block needs to be deleted
-
 
833
                        List<Integer> schemeIdsToReject = schemeRepository.selectBySchemeIds(creditedSchemeIds).stream()
-
 
834
                                .filter(x -> SchemeType.OUT_TYPES.contains(x.getType()) && !SchemeType.SPECIAL_SUPPORT.equals(x.getType()))
-
 
835
                                .map(x -> x.getId()).collect(Collectors.toList());
-
 
836
                        //Reject invalid scheme payouts due to upgrade in Category or any change in schemes historically
-
 
837
                        //Lets not touchs
-
 
838
                        for (SchemeInOut sio : sios) {
841
                        for (SchemeInOut sio : sios) {
839
                            if (schemeIdsToReject.contains(sio.getSchemeId()) && !schemeSummaryModelMap.containsKey(sio.getSchemeId())) {
842
                            if (schemeIdsToReject.contains(sio.getSchemeId()) && !schemeSummaryModelMap.containsKey(sio.getSchemeId())) {
840
                                Scheme scheme = schemeRepository.selectById(sio.getSchemeId());
843
                                Scheme scheme = schemeRepository.selectById(sio.getSchemeId());
841
                                sio.setStatusDescription("Rolledback due to Category upgrade/invalid scheme");
844
                                sio.setStatusDescription("Rolledback due to Category upgrade/invalid scheme");
842
                                sio.setStatus(SchemePayoutStatus.REJECTED);
845
                                sio.setStatus(SchemePayoutStatus.REJECTED);