Subversion Repositories SmartDukaan

Rev

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

Rev 33549 Rev 33600
Line 71... Line 71...
71 
 
 71 
 
72 
    private static final Logger LOGGER = LogManager.getLogger(SchemeServiceImpl.class);
 72 
    private static final Logger LOGGER = LogManager.getLogger(SchemeServiceImpl.class);
73 
    private static final Set<Integer> tagIds = new HashSet<>(Arrays.asList(4));
 73 
    private static final Set<Integer> tagIds = new HashSet<>(Arrays.asList(4));
74 
    private static final List<String> BLOCKED_IMEIS = Arrays.asList("864883056397593", "864883054606656", "864883056567815", "861950056518271", "869175055649511", "861362058924574", "866009066803036", "866009066816699", "866009066816137", "866009066815873", "866009066805536", "866009066803010", "866009066821939", "866009066802756", "866009066820592", "866009066820311", "866009066816491", "866009066816376", "866009066815899", "866009066815774", "866009066817937", "866009066819859", "866009066817655", "866009066820691", "866009066820832", "866009066803291", "866009066820733", "866009066814496", "866009066820451", "866009066820659", "866009066804976", "866009066820717", "866009066816095", "861362054898434", "869599051117852", "869599056695332", "869599056695894", "864883057389656", "862661052418692", "860118051929254", "862888051664998", "862680054625831", "862888051666316", "860118051738895", "868066050447970", "868066052424399", "865084051552576", "865084050755097", "865084050755295", "865084050754819", "864883057487278", "864883057389599", "864883057437455", "864883057388278", "862680058278058", "869599056810139", "862200053994193", "861932057188916", "861175050581774", "863933065909093", "863933065635391", "861362054889177", "864004062055154", "864004062069239", "862661050221676", "862661052416993", "866812058631475", "869599051118173", "869599051504273", "868066052729250", "864883057701397", "864883054123033", "864883054947316", "864883056235694", "868066052727692", "866030052139896", "866030052140175", "860588051522053", "860588051513193", "861932056969779", "869599056171995", "865594061074932", "863935059410491", "866088059072718", "869599055375894", "869599054306916", "863782054006472", "863782054012371", "860588053486992", "868066052726835", "868066052726694", "860688053876430", "860688053869674", "868494054682394", "869599053512357");
 74 
    private static final List<String> BLOCKED_IMEIS = Arrays.asList("864883056397593", "864883054606656", "864883056567815", "861950056518271", "869175055649511", "861362058924574", "866009066803036", "866009066816699", "866009066816137", "866009066815873", "866009066805536", "866009066803010", "866009066821939", "866009066802756", "866009066820592", "866009066820311", "866009066816491", "866009066816376", "866009066815899", "866009066815774", "866009066817937", "866009066819859", "866009066817655", "866009066820691", "866009066820832", "866009066803291", "866009066820733", "866009066814496", "866009066820451", "866009066820659", "866009066804976", "866009066820717", "866009066816095", "861362054898434", "869599051117852", "869599056695332", "869599056695894", "864883057389656", "862661052418692", "860118051929254", "862888051664998", "862680054625831", "862888051666316", "860118051738895", "868066050447970", "868066052424399", "865084051552576", "865084050755097", "865084050755295", "865084050754819", "864883057487278", "864883057389599", "864883057437455", "864883057388278", "862680058278058", "869599056810139", "862200053994193", "861932057188916", "861175050581774", "863933065909093", "863933065635391", "861362054889177", "864004062055154", "864004062069239", "862661050221676", "862661052416993", "866812058631475", "869599051118173", "869599051504273", "868066052729250", "864883057701397", "864883054123033", "864883054947316", "864883056235694", "868066052727692", "866030052139896", "866030052140175", "860588051522053", "860588051513193", "861932056969779", "869599056171995", "865594061074932", "863935059410491", "866088059072718", "869599055375894", "869599054306916", "863782054006472", "863782054012371", "860588053486992", "868066052726835", "868066052726694", "860688053876430", "860688053869674", "868494054682394", "869599053512357");
75 
    private static final List<SchemeType> ACTIVATION_SCHEME_TYPES = Arrays.asList(SchemeType.ACTIVATION, SchemeType.SPECIAL_SUPPORT, SchemeType.SELLOUT);
 75 
    private static final List<SchemeType> ACTIVATION_SCHEME_TYPES = Arrays.asList(SchemeType.ACTIVATION, SchemeType.SPECIAL_SUPPORT, SchemeType.SELLOUT);
- 
 
 76 
 
76 
    @Autowired
 77 
    @Autowired
77 
    StateGstRateRepository stateGstRateRepository;
 78 
    StateGstRateRepository stateGstRateRepository;
78 
    @Autowired
 79 
    @Autowired
79 
    NotificationService notificationService;
 80 
    NotificationService notificationService;
80 
    @Autowired
 81 
    @Autowired
Line 119... Line 120...
119 
    private FofoOrderRepository fofoOrderRepository;
 120 
    private FofoOrderRepository fofoOrderRepository;
120 
 
 121 
 
121 
    @Autowired
 122 
    @Autowired
122 
    private PriceCircularService priceCircularService;
 123 
    private PriceCircularService priceCircularService;
123 
 
 124 
 
- 
 
 125 
    @Autowired
- 
 
 126 
    private SamsungExceptionRepository samsungExceptionRepository;
- 
 
 127 
 
124 
    @Override
 128 
    @Override
125 
    public void saveScheme(int creatorId, CreateSchemeRequest createSchemeRequest) throws ProfitMandiBusinessException {
 129 
    public void saveScheme(int creatorId, CreateSchemeRequest createSchemeRequest) throws ProfitMandiBusinessException {
126 
 
 130 
 
127 
        this.validateCreateSchemeRequest(createSchemeRequest);
 131 
        this.validateCreateSchemeRequest(createSchemeRequest);
128 
 
 132 
 
Line 680... Line 684...
680 
                    .collect(Collectors.toSet());
 684 
                    .collect(Collectors.toSet());
681 
            inventoryItems = inventoryItems.stream().filter(inventoryItem -> !BLOCKED_IMEIS.contains(inventoryItem.getSerialNumber())).collect(Collectors.toSet());
 685 
            inventoryItems = inventoryItems.stream().filter(inventoryItem -> !BLOCKED_IMEIS.contains(inventoryItem.getSerialNumber())).collect(Collectors.toSet());
682 
 
 686 
 
683 
            //Do not consider imei above 90 days for samsung
 687 
            //Do not consider imei above 90 days for samsung
684 
            List<String> samsungSerialNumbers = inventoryItems.stream().filter(x -> x.getItem().getBrand().equalsIgnoreCase("samsung")).map(x -> x.getSerialNumber()).collect(Collectors.toList());
 688 
            List<String> samsungSerialNumbers = inventoryItems.stream().filter(x -> x.getItem().getBrand().equalsIgnoreCase("samsung")).map(x -> x.getSerialNumber()).collect(Collectors.toList());
- 
 
 689 
 
685 
            if (samsungSerialNumbers.size() > 0) {
 690 
            if (samsungSerialNumbers.size() > 0) {
686 
                List<AgeingSummaryModel> billedImeiModels = warehouseInventoryItemRepository.findStockAgeingByFofoIdSerialNumbers(retailerId, samsungSerialNumbers);
 691 
                List<AgeingSummaryModel> billedImeiModels = warehouseInventoryItemRepository.findStockAgeingByFofoIdSerialNumbers(retailerId, samsungSerialNumbers);
687 
                Set<String> agedSerialNumbers = billedImeiModels.stream().filter(x -> x.isAgedAbove(300)).map(x -> x.getSerialNumber()).collect(Collectors.toSet());
 692 
                Set<String> agedSerialNumbers = billedImeiModels.stream().filter(x -> x.isAgedAbove(365)).map(x -> x.getSerialNumber()).collect(Collectors.toSet());
- 
 
 693 
                Set<String> samsungExceptionsSerialNumbers = samsungExceptionRepository.selectAllBySerialNumber(agedSerialNumbers).stream().map(x -> x.getSerialNumber()).collect(Collectors.toSet());
- 
 
 694 
                agedSerialNumbers.removeAll(samsungExceptionsSerialNumbers);
688 
                inventoryItems = inventoryItems.stream().filter(x -> !agedSerialNumbers.contains(x.getSerialNumber())).collect(Collectors.toSet());
 695 
                inventoryItems = inventoryItems.stream().filter(x -> !agedSerialNumbers.contains(x.getSerialNumber())).collect(Collectors.toSet());
689 
            }
 696 
            }
690 
 
 697 
 
691 
            if (inventoryItems.size() == 0) return 0;
 698 
            if (inventoryItems.size() == 0) return 0;
692 
 
 699