Subversion Repositories SmartDukaan

Rev

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

Rev 25517 Rev 25579
Line 514... Line 514...
514
			int itemCashback = 0;
514
			int itemCashback = 0;
515
			Purchase purchase = purchaseRepository.selectByIdAndFofoId(inventoryItem.getPurchaseId(), retailerId);
515
			Purchase purchase = purchaseRepository.selectByIdAndFofoId(inventoryItem.getPurchaseId(), retailerId);
516
			Set<Integer> schemeIds = new HashSet<>(
516
			Set<Integer> schemeIds = new HashSet<>(
517
					schemeItemRepository.selectSchemeIdByItemId(inventoryItem.getItemId()));
517
					schemeItemRepository.selectSchemeIdByItemId(inventoryItem.getItemId()));
518
			List<Scheme> schemes = null;
518
			List<Scheme> schemes = null;
-
 
519
			if(purchase.getCompleteTimestamp()==null) {
-
 
520
				continue;
-
 
521
			}
519
			if (purchase.getCompleteTimestamp().isAfter(LocalDate.of(2019, 9, 1).atStartOfDay())) {
522
			if (purchase.getCompleteTimestamp().isAfter(LocalDate.of(2019, 9, 1).atStartOfDay())) {
520
				schemes = schemeRepository.selectActiveAll(SchemeType.OUT, partnerType, fofoOrder.getCreateTimestamp());
523
				schemes = schemeRepository.selectActiveAll(SchemeType.OUT, partnerType, fofoOrder.getCreateTimestamp());
521
			} else {
524
			} else {
522
				schemes = schemeRepository.selectActiveAll(SchemeType.OUT, partnerType,
525
				schemes = schemeRepository.selectActiveAll(SchemeType.OUT, partnerType,
523
						purchase.getCompleteTimestamp());
526
						purchase.getCompleteTimestamp());