Subversion Repositories SmartDukaan

Rev

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

Rev 30957 Rev 31005
Line 1070... Line 1070...
1070
			SchemesImeisModel schemesImeisModel = imeiListEntry.getValue().get(0);
1070
			SchemesImeisModel schemesImeisModel = imeiListEntry.getValue().get(0);
1071
			List<Integer> schemeIds = imeiListEntry.getValue().stream().map(x -> x.getSchemeId()).collect(Collectors.toList());
1071
			List<Integer> schemeIds = imeiListEntry.getValue().stream().map(x -> x.getSchemeId()).collect(Collectors.toList());
1072
			LOGGER.info("Serial Number  - {}, Scheme IDs - {}", schemesImeisModel.getImei(), schemeIds);
1072
			LOGGER.info("Serial Number  - {}, Scheme IDs - {}", schemesImeisModel.getImei(), schemeIds);
1073
			InventoryItem inventoryItem = inventoryItemRepository.selectById(schemesImeisModel.getInventoryItemId());
1073
			InventoryItem inventoryItem = inventoryItemRepository.selectById(schemesImeisModel.getInventoryItemId());
1074
			List<Scheme> schemes = schemeRepository.selectBySchemeIds(schemeIds);
1074
			List<Scheme> schemes = schemeRepository.selectBySchemeIds(schemeIds);
1075
			List<Scheme> activationSchemes = schemes.stream().filter(x -> x.getType().equals(SchemeType.ACTIVATION)).collect(Collectors.toList());
-
 
1076
			List<Scheme> supportSchemes = schemes.stream().filter(x -> x.getType().equals(SchemeType.SPECIAL_SUPPORT)).collect(Collectors.toList());
1075
			List<Scheme> supportSchemes = schemes.stream().filter(x -> Arrays.asList(SchemeType.SPECIAL_SUPPORT, SchemeType.ACTIVATION).contains(x.getType())).collect(Collectors.toList());
1077
			for (Scheme scheme : activationSchemes) {
-
 
1078
				this.createSchemeInOut(scheme, inventoryItem);
-
 
1079
			}
-
 
1080
			if (supportSchemes.size() > 0) {
1076
			if (supportSchemes.size() > 0) {
1081
				FofoOrder fofoOrder = validOrdersMap.get(schemesImeisModel.getOrderId());
1077
				FofoOrder fofoOrder = validOrdersMap.get(schemesImeisModel.getOrderId());
1082
				PartnerType partnerType = partnerTypeChangeService.getTypeOnMonth(fofoOrder.getFofoId(),
1078
				PartnerType partnerType = partnerTypeChangeService.getTypeOnMonth(fofoOrder.getFofoId(),
1083
						YearMonth.from(fofoOrder.getCreateTimestamp()));
1079
						YearMonth.from(fofoOrder.getCreateTimestamp()));
1084
				this.processSpecialSupport(fofoOrder, supportSchemes, inventoryItem, partnerType, fofoOrder.getCreateTimestamp());
1080
				this.processSpecialSupport(fofoOrder, supportSchemes, inventoryItem, partnerType, fofoOrder.getCreateTimestamp());