WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java

 		if (scheme.getExpireTimestamp() != null) {
 			throw new ProfitMandiBusinessException(ProfitMandiConstants.EXPIRE_TIMESTAMP, scheme.getExpireTimestamp(),
 					"SCHM_1008");
+		}
 		scheme.setExpireTimestamp(LocalDateTime.now());
-		if(expiryTime.isAfter(scheme.getEndDateTime())) {
+		if (expiryTime.isAfter(scheme.getEndDateTime())) {
 			throw new ProfitMandiBusinessException(ProfitMandiConstants.EXPIRE_TIMESTAMP, scheme.getExpireTimestamp(),
 					"End Date cant be extended during expiry");
+		}
 		scheme.setEndDateTime(expiryTime);
 		schemeRepository.persist(scheme);
 	@Override
 	public void processSchemeIn(int purchaseId, int retailerId) throws ProfitMandiBusinessException {
 		LOGGER.info("Trying to process SchemeIn with purchaseId [{}] and retailerId [{}]", purchaseId, retailerId);
 		Purchase purchase = purchaseRepository.selectByIdAndFofoId(purchaseId, retailerId);
-		//TODO - SCHEME
+		// TODO - SCHEME
-		//PartnerType partnerType = partnerTypeChangeService.getTypeOnMonth(retailerId, YearMonth.from(purchase.getCreateTimestamp()));
+		PartnerType partnerType = partnerTypeChangeService.getTypeOnMonth(retailerId,
+				YearMonth.from(purchase.getCreateTimestamp()));
-		PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(retailerId, purchase.getCreateTimestamp().toLocalDate());
+		// PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(retailerId,
+		// purchase.getCreateTimestamp().toLocalDate());
-		List<Scheme> schemes = schemeRepository.selectActiveAll(SchemeType.IN, partnerType,
+		List<Scheme> schemes = schemeRepository.selectActiveAll(Arrays.asList(SchemeType.IN), partnerType,
 				purchase.getCreateTimestamp(), false);
 		float totalCashback = 0;
 		if (schemes.isEmpty()) {
 			return;
+		}
 			purchaseRepository.persist(purchase);
+		}
+	}
 	private float createSchemeInOut(Scheme scheme, InventoryItem inventoryItem) {
-		List<SchemeInOut> schemeInOuts = schemeInOutRepository.selectAll(inventoryItem.getId());
+		List<SchemeInOut> sios = schemeInOutRepository.selectAllByType(scheme.getType(), inventoryItem.getId());
-		float amountToCredit = 0;
+		float actualCredit = 0;
-		if (schemeInOuts.stream().filter(x -> x.getRolledBackTimestamp() == null && x.getSchemeId()==scheme.getId()).collect(Collectors.toList())
+		if (sios.stream().filter(x -> x.getRolledBackTimestamp() == null && x.getSchemeId() == scheme.getId())
+				.collect(Collectors.toList()).size() == 0) {
+			float amountToCredit = this.getAmount(inventoryItem, scheme);
+			if (!scheme.getType().equals(SchemeType.IN) && sios.size() > 0) {
-				.size() == 0) {
+				if(sios.size() > 1) {
+					LOGGER.info("SAMESCHEMETYPE has already been credited twice for inventoryItem - {}", inventoryItem.getId());
+					return 0;
+				}
+				float amountCredited = (float) sios.stream().mapToDouble(e -> e.getAmount()).sum();
+				if(amountToCredit > amountCredited + 1f) {
+					for (SchemeInOut sio : sios) {
+						sio.setRolledBackTimestamp(LocalDateTime.now());
+						sio.setStatus(SchemePayoutStatus.REJECTED);
+						sio.setStatusDescription("Partner Category upgraded, new entry added");
+					}
+					actualCredit = amountToCredit - amountCredited;
+				} else {
+					return 0;
+				}
+			} else {
+				actualCredit = amountToCredit;
+			}
 			SchemeInOut schemeInOut = new SchemeInOut();
-			amountToCredit = this.getAmount(inventoryItem, scheme);
 			schemeInOut.setSchemeId(scheme.getId());
 			schemeInOut.setInventoryItemId(inventoryItem.getId());
 			schemeInOut.setAmount(amountToCredit);
 			schemeInOutRepository.persist(schemeInOut);
 			if (scheme.getType().equals(SchemeType.ACTIVATION)) {
 				schemeInOut.setStatus(SchemePayoutStatus.PENDING);
 				schemeInOut.setStatusDescription("Activation pending for IMEI#" + inventoryItem.getSerialNumber());
 				return 0;
 			} else if (scheme.getType().equals(SchemeType.INVESTMENT)) {
 				return 0;
 			} else {
 				schemeInOut.setStatus(SchemePayoutStatus.CREDITED);
 				if (scheme.getType().equals(SchemeType.IN)) {
 					schemeInOut.setStatusDescription("Credited for GRN of IMEI#" + inventoryItem.getSerialNumber());
-				} else if(scheme.getType().equals(SchemeType.OUT) || scheme.getType().equals(SchemeType.CATEGORY)){
+				} else if (SchemeService.OUT_SCHEME_TYPES.contains(scheme.getType())) {
 					schemeInOut.setStatusDescription("Credited for sale of IMEI#" + inventoryItem.getSerialNumber());
-					if(scheme.getType().equals(SchemeType.CATEGORY)) {
-						List<SchemeInOut> sios = schemeInOutRepository.selectAllByType(SchemeType.CATEGORY, inventoryItem.getId());
-						SchemeInOut sio = sios.stream().filter(x->x.getId()!=schemeInOut.getId()).findFirst().orElse(null);
-						if(sio != null) {
-							sio.setRolledBackTimestamp(LocalDateTime.now());
-							sio.setStatus(SchemePayoutStatus.REJECTED);
-							sio.setStatusDescription("Category upgraded, new entry added");
-							amountToCredit -= sio.getAmount();
-							schemeInOut.setStatusDescription("Category upgraded, higher margins credited for sale of IMEI#" + inventoryItem.getSerialNumber());
-						}
-					}
+				}
 				schemeInOut.setCreditTimestamp(LocalDateTime.now());
+			}
+		}
-		return amountToCredit;
+		return actualCredit;
+	}
 	// We are maintaining price drop after grn
 	private float getAmount(InventoryItem inventoryItem, Scheme scheme) {
 		float amount = 0;
+	}
 	@Override
 	public void processSchemeOut(int fofoOrderId, int retailerId) throws ProfitMandiBusinessException {
 		FofoOrder fofoOrder = fofoOrderRepository.selectByFofoIdAndOrderId(retailerId, fofoOrderId);
-		//Process only if order is not cancelled
+		// Process only if order is not cancelled
-		if(fofoOrder.getCancelledTimestamp()==null) {
+		if (fofoOrder.getCancelledTimestamp() == null) {
-			PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(retailerId, fofoOrder.getCreateTimestamp().toLocalDate());
+			// PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(retailerId,
+			// fofoOrder.getCreateTimestamp().toLocalDate());
-			//TODO - SCHEME
+			// TODO - SCHEME
-			//PartnerType partnerType = partnerTypeChangeService.getTypeOnMonth(retailerId, YearMonth.from(fofoOrder.getCreateTimestamp()));
+			PartnerType partnerType = partnerTypeChangeService.getTypeOnMonth(retailerId,
+					YearMonth.from(fofoOrder.getCreateTimestamp()));
 			List<ScanRecord> scanRecords = scanRecordRepository.selectAllByOrderId(fofoOrderId);
 			Set<Integer> inventoryItemIds = scanRecords.stream().map(x -> x.getInventoryItemId())
 					.collect(Collectors.toSet());
 			Set<InventoryItem> inventoryItems = inventoryItemRepository.selectByIds(inventoryItemIds).stream()
 					.filter(x -> x.getSerialNumber() != null && !x.getSerialNumber().equals(""))
 					.collect(Collectors.toSet());
 			if (inventoryItems.size() == 0) {
 				return;
+			}
 			Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
-			//Remove Items that are eol now.
+			// Remove Items that are eol now.
 			Set<Integer> itemIdsSet = tagListingRepository.selectByItemIdsAndTagIds(itemIds, tagIds).stream()
 					.filter(x -> x.getEolDate() == null || x.getEolDate().isAfter(fofoOrder.getCreateTimestamp()))
 					.map(x -> x.getItemId()).collect(Collectors.toSet());
 			// Only consider inventory items that were not returned
 			inventoryItems = inventoryItems.stream().filter(x -> itemIdsSet.contains(x.getItemId()))
 					.collect(Collectors.toSet());
 			if (inventoryItems.size() == 0) {
 				return;
+			}
 			float totalCashback = 0;
 			int count = 0;
+			List<SchemeType> allOutSchemeTypes = new ArrayList<>();
+			allOutSchemeTypes.addAll(Arrays.asList(SchemeType.ACTIVATION, SchemeType.INVESTMENT));
+			allOutSchemeTypes.addAll(OUT_SCHEME_TYPES);
-			List<Scheme> allActiveSchemes = schemeRepository.selectActiveAll(SchemeType.OUT, partnerType,
+			List<Scheme> allActiveSchemes = schemeRepository.selectActiveAll(allOutSchemeTypes, partnerType,
 					fofoOrder.getCreateTimestamp(), false);
-			allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.ACTIVATION, partnerType,
-					fofoOrder.getCreateTimestamp(), false));
-			allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.INVESTMENT, partnerType,
-					fofoOrder.getCreateTimestamp(), false));
-			allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.CATEGORY, partnerType,
-					fofoOrder.getCreateTimestamp(), false));
 			for (InventoryItem inventoryItem : inventoryItems) {
 				float itemCashback = 0;
 				Set<Integer> schemeIds = new HashSet<>(
 						schemeItemRepository.selectSchemeIdByItemId(inventoryItem.getItemId()));
-				allActiveSchemes = allActiveSchemes.stream().filter(x -> schemeIds.contains(x.getId()))
+				List<Scheme> itemActiveSchemes = allActiveSchemes.stream().filter(x -> schemeIds.contains(x.getId()))
 						.collect(Collectors.toList());
-				for (Scheme scheme : allActiveSchemes) {
+				for (Scheme scheme : itemActiveSchemes) {
 					itemCashback += this.createSchemeInOut(scheme, inventoryItem);
+				}
 				if (itemCashback > 0) {
 					count++;
 					totalCashback += itemCashback;
+				}
+			}
 			if (count > 0) {
+				walletService.addAmountToWallet(
-				walletService.addAmountToWallet(retailerId, fofoOrderId, WalletReferenceType.SCHEME_OUT,
+						retailerId, fofoOrderId, WalletReferenceType.SCHEME_OUT, "Sales margin for invoice number "
-						"Sales margin for invoice number " + fofoOrder.getInvoiceNumber() + ". Total " + count + " pc(s)",
+								+ fofoOrder.getInvoiceNumber() + ". Total " + count + " pc(s)",
 						totalCashback, fofoOrder.getCreateTimestamp());
 				fofoOrder.setCashback(totalCashback);
 				fofoOrderRepository.persist(fofoOrder);
+			}
+		}
 		float amountToRollback = 0;
 		List<SchemeInOut> schemes = schemeInOutRepository.selectByInventoryItemIds(inventoryItemIdSet);
 		for (SchemeInOut schemeInOut : schemes) {
 			if (schemeInOut.getRolledBackTimestamp() == null) {
 				schemeInOut.setRolledBackTimestamp(LocalDateTime.now());
-				if (schemeInOut.getStatus()==null || schemeInOut.getStatus().equals(SchemePayoutStatus.CREDITED)) {
+				if (schemeInOut.getStatus() == null || schemeInOut.getStatus().equals(SchemePayoutStatus.CREDITED)) {
 					amountToRollback += schemeInOut.getAmount();
+				}
 				schemeInOut.setStatus(SchemePayoutStatus.REJECTED);
 				schemeInOut.setStatusDescription(rollbackReason);
+			}
+	}
 	@Override
 	// Always being called from cancel order means no SCHEME IN is considered
 	public void reverseSchemes(List<InventoryItem> inventoryItems, int reversalReference, String reversalReason,
-			SchemeType schemeType) throws ProfitMandiBusinessException {
+			List<SchemeType> schemeTypes) throws ProfitMandiBusinessException {
 		Map<Integer, InventoryItem> inventoryItemsMap = inventoryItems.stream()
 				.collect(Collectors.toMap(x -> x.getId(), x -> x));
 		LOGGER.info("inventoryItems" + inventoryItems);
 		List<SchemeInOut> schemeInOuts = schemeInOutRepository.selectByInventoryItemIds(inventoryItemsMap.keySet());
 			Map<Integer, Scheme> schemesMap = schemeRepository.selectBySchemeIds(schemeIds, 0, schemeIds.size())
 					.stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
 			for (SchemeInOut schemeInOut : schemeInOuts) {
 				Scheme scheme = schemesMap.get(schemeInOut.getSchemeId());
-				if (scheme.getType().equals(schemeType)) {
+				if (schemeTypes.contains(scheme.getType())) {
 					if (schemeInOut.getRolledBackTimestamp() == null) {
 						schemeInOut.setRolledBackTimestamp(LocalDateTime.now());
 						if (schemeInOut.getStatus().equals(SchemePayoutStatus.CREDITED)) {
 							amountToRollback += schemeInOut.getAmount();
+						}
+				}
+			}
+		}
 		int fofoId = inventoryItems.get(0).getFofoId();
-		WalletReferenceType walletReferenceType = schemeType.equals(SchemeType.OUT) || schemeType.equals(SchemeType.CATEGORY) ? WalletReferenceType.SCHEME_OUT
+		WalletReferenceType walletReferenceType = schemeTypes.containsAll(SchemeService.OUT_SCHEME_TYPES)
+				? WalletReferenceType.SCHEME_OUT
-				: schemeType.equals(SchemeType.INVESTMENT) ? WalletReferenceType.INVESTMENT_PAYOUT
+				: (schemeTypes.contains(SchemeType.ACTIVATION) ? WalletReferenceType.ACTIVATION_SCHEME
-						: WalletReferenceType.ACTIVATION_SCHEME;
+						: WalletReferenceType.INVESTMENT_PAYOUT);
 		if (amountToRollback > 0) {
+			// Mark appropriate reference of rollback investment margin
+			if (schemeTypes.contains(SchemeType.INVESTMENT)) {
+				reversalReference = Integer
+						.parseInt(FormattingUtils.getYearMonth(schemeInOuts.get(0).getCreditTimestamp()));
-			// TODO//
+			}
 			walletService.rollbackAmountFromWallet(fofoId, amountToRollback, reversalReference, walletReferenceType,
 					reversalReason, LocalDateTime.now());
+		}
+	}
 	@Override
 	@Cacheable(value = "itemSchemeCashback", cacheManager = "timeoutCacheManager")
 	public Map<Integer, Float> getItemSchemeCashBack() {
 		Map<Integer, Float> itemCashbackMap = new HashMap<>();
 		Map<Integer, Scheme> cashbackSchemesMap = schemeRepository
-				.selectActiveAll(SchemeType.ACTIVATION, PartnerType.ALL, LocalDateTime.now(), true).stream()
+				.selectActiveAll(Arrays.asList(SchemeType.ACTIVATION), PartnerType.ALL, LocalDateTime.now(), true)
-				.filter(x -> x.getAmountType().equals(AmountType.FIXED))
+				.stream().filter(x -> x.getAmountType().equals(AmountType.FIXED))
 				.collect(Collectors.toMap(x -> x.getId(), x -> x));
 		if (cashbackSchemesMap.size() > 0) {
 			List<SchemeItem> schemeItems = schemeItemRepository.selectBySchemeIds(cashbackSchemesMap.keySet());
 			schemeItems.stream().forEach(x -> {
 				itemCashbackMap.put(x.getItemId(), cashbackSchemesMap.get(x.getSchemeId()).getAmount());

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/SchemeServiceImpl.java – Rev 28979 → 29231