Subversion Repositories SmartDukaan

Rev

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

Rev 31170 Rev 31336
Line 117... Line 117...
117
	private PurchaseRepository purchaseRepository;
117
	private PurchaseRepository purchaseRepository;
118
 
118
 
119
	@Autowired
119
	@Autowired
120
	private FofoOrderRepository fofoOrderRepository;
120
	private FofoOrderRepository fofoOrderRepository;
121
 
121
 
-
 
122
	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", "868494052222110", "868494054682394", "869599053512357");
-
 
123
 
122
	private static final List<SchemeType> ACTIVATION_SCHEME_TYPES = Arrays.asList(SchemeType.ACTIVATION, SchemeType.SPECIAL_SUPPORT);
124
	private static final List<SchemeType> ACTIVATION_SCHEME_TYPES = Arrays.asList(SchemeType.ACTIVATION, SchemeType.SPECIAL_SUPPORT);
123
 
125
 
124
	@Override
126
	@Override
125
	public void saveScheme(int creatorId, CreateSchemeRequest createSchemeRequest) throws ProfitMandiBusinessException {
127
	public void saveScheme(int creatorId, CreateSchemeRequest createSchemeRequest) throws ProfitMandiBusinessException {
126
 
128
 
Line 403... Line 405...
403
 
405
 
404
		if (schemes.isEmpty()) {
406
		if (schemes.isEmpty()) {
405
			return;
407
			return;
406
		}
408
		}
407
		List<InventoryItem> inventoryItems = inventoryItemRepository.selectByPurchaseId(purchaseId);
409
		List<InventoryItem> inventoryItems = inventoryItemRepository.selectByPurchaseId(purchaseId);
-
 
410
		//Remove imeis from blocked imeis list
-
 
411
		inventoryItems = inventoryItems.stream().filter(inventoryItem -> BLOCKED_IMEIS.contains(inventoryItem.getSerialNumber())).collect(Collectors.toList());
408
 
412
 
409
		Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
413
		Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
410
		Map<Integer, Item> itemsMap = itemRepository.selectByIds(itemIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
414
		Map<Integer, Item> itemsMap = itemRepository.selectByIds(itemIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
411
		inventoryItems.stream().forEach(x -> x.setItem(itemsMap.get(x.getItemId())));
415
		inventoryItems.stream().forEach(x -> x.setItem(itemsMap.get(x.getItemId())));
412
 
416
 
Line 549... Line 553...
549
		return actualCredit;
553
		return actualCredit;
550
	}
554
	}
551
 
555
 
552
	// We are maintaining price drop after grn
556
	// We are maintaining price drop after grn
553
	private float getAmount(InventoryItem inventoryItem, Scheme scheme) throws ProfitMandiBusinessException {
557
	private float getAmount(InventoryItem inventoryItem, Scheme scheme) throws ProfitMandiBusinessException {
-
 
558
		if (BLOCKED_IMEIS.contains(inventoryItem.getSerialNumber())) {
-
 
559
			return 0;
-
 
560
		}
554
		float amount = 0;
561
		float amount = 0;
555
		float dpForCalc = 0;
562
		float dpForCalc = 0;
556
		float taxableSellingPrice = 0;
563
		float taxableSellingPrice = 0;
557
 
564
 
558
		//float totalTaxRate = stateGstRateRepository.getTotalTaxRate(inventoryItem.getItemId());
565
		//float totalTaxRate = stateGstRateRepository.getTotalTaxRate(inventoryItem.getItemId());
Line 602... Line 609...
602
			LOGGER.info("scanRecords --- {}", scanRecords);
609
			LOGGER.info("scanRecords --- {}", scanRecords);
603
			LOGGER.info("inventoryItemIds --- {}", inventoryItemIds);
610
			LOGGER.info("inventoryItemIds --- {}", inventoryItemIds);
604
			Set<InventoryItem> inventoryItems = inventoryItemRepository.selectByIds(inventoryItemIds).stream()
611
			Set<InventoryItem> inventoryItems = inventoryItemRepository.selectByIds(inventoryItemIds).stream()
605
					.filter(x -> x.getSerialNumber() != null && !x.getSerialNumber().equals(""))
612
					.filter(x -> x.getSerialNumber() != null && !x.getSerialNumber().equals(""))
606
					.collect(Collectors.toSet());
613
					.collect(Collectors.toSet());
-
 
614
			inventoryItems = inventoryItems.stream().filter(inventoryItem -> BLOCKED_IMEIS.contains(inventoryItem.getSerialNumber())).collect(Collectors.toSet());
607
			if (inventoryItems.size() == 0) {
615
			if (inventoryItems.size() == 0) {
608
				return 0;
616
				return 0;
609
			}
617
			}
610
			Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
618
			Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
611
 
619