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

 package com.spice.profitmandi.service.scheme;
 import java.text.MessageFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 	@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);
-		PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(retailerId,
+		PartnerType partnerType = partnerTypeChangeService.getTypeOnMonth(retailerId, YearMonth.from(purchase.getCreateTimestamp()));
-				purchase.getCreateTimestamp().toLocalDate());
 		List<Scheme> schemes = schemeRepository.selectActiveAll(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.selectByScheme(scheme.getId(), inventoryItem.getId());
+		List<SchemeInOut> schemeInOuts = schemeInOutRepository.selectAll(inventoryItem.getId());
 		float amountToCredit = 0;
 		if (schemeInOuts.stream().filter(x -> x.getRolledBackTimestamp() == null).collect(Collectors.toList())
 				.size() == 0) {
 			SchemeInOut schemeInOut = new SchemeInOut();
 			amountToCredit = this.getAmount(inventoryItem, scheme);
 				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)){
 					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;
+	}
 	@Override
 	public void processSchemeOut(int fofoOrderId, int retailerId) throws ProfitMandiBusinessException {
 		FofoOrder fofoOrder = fofoOrderRepository.selectByFofoIdAndOrderId(retailerId, fofoOrderId);
+		//Process only if order is not cancelled
+		if(fofoOrder.getCancelledTimestamp()==null) {
-		PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(retailerId,
+			//PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(retailerId,
-				fofoOrder.getCreateTimestamp().toLocalDate());
+			//		fofoOrder.getCreateTimestamp().toLocalDate());
+			PartnerType partnerType = partnerTypeChangeService.getTypeOnMonth(retailerId, YearMonth.from(fofoOrder.getCreateTimestamp()));
-		List<ScanRecord> scanRecords = scanRecordRepository.selectAllByOrderId(fofoOrderId);
+			List<ScanRecord> scanRecords = scanRecordRepository.selectAllByOrderId(fofoOrderId);
-		Set<Integer> inventoryItemIds = scanRecords.stream().map(x -> x.getInventoryItemId())
+			Set<Integer> inventoryItemIds = scanRecords.stream().map(x -> x.getInventoryItemId())
-				.collect(Collectors.toSet());
+					.collect(Collectors.toSet());
-		Set<InventoryItem> inventoryItems = inventoryItemRepository.selectByIds(inventoryItemIds).stream()
+			Set<InventoryItem> inventoryItems = inventoryItemRepository.selectByIds(inventoryItemIds).stream()
-				.filter(x -> x.getSerialNumber() != null && !x.getSerialNumber().equals(""))
+					.filter(x -> x.getSerialNumber() != null && !x.getSerialNumber().equals(""))
-				.collect(Collectors.toSet());
+					.collect(Collectors.toSet());
-		if (inventoryItems.size() == 0) {
+			if (inventoryItems.size() == 0) {
-			return;
+				return;
-		}
+			}
-		Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
+			Set<Integer> itemIds = inventoryItems.stream().map(x -> x.getItemId()).collect(Collectors.toSet());
+			//Remove Items that are eol now.
-		Set<Integer> itemIdsSet = tagListingRepository.selectByItemIdsAndTagIds(itemIds, tagIds).stream()
+			Set<Integer> itemIdsSet = tagListingRepository.selectByItemIdsAndTagIds(itemIds, tagIds).stream()
-				.filter(x -> x.getEolDate() == null || x.getEolDate().isAfter(fofoOrder.getCreateTimestamp()))
+					.filter(x -> x.getEolDate() == null || x.getEolDate().isAfter(fofoOrder.getCreateTimestamp()))
-				.map(x -> x.getItemId()).collect(Collectors.toSet());
+					.map(x -> x.getItemId()).collect(Collectors.toSet());
-		// Only consider inventory items that were not returned
+			// Only consider inventory items that were not returned
-		inventoryItems = inventoryItems.stream().filter(x -> itemIdsSet.contains(x.getItemId()))
+			inventoryItems = inventoryItems.stream().filter(x -> itemIdsSet.contains(x.getItemId()))
-				.collect(Collectors.toSet());
+					.collect(Collectors.toSet());
-		if (inventoryItems.size() == 0) {
+			if (inventoryItems.size() == 0) {
-			return;
+				return;
-		}
+			}
-		float totalCashback = 0;
+			float totalCashback = 0;
-		int count = 0;
+			int count = 0;
-		List<Scheme> allActiveSchemes = schemeRepository.selectActiveAll(SchemeType.OUT, partnerType,
+			List<Scheme> allActiveSchemes = schemeRepository.selectActiveAll(SchemeType.OUT, partnerType,
-				fofoOrder.getCreateTimestamp(), false);
+					fofoOrder.getCreateTimestamp(), false);
-		allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.ACTIVATION, partnerType,
+			allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.ACTIVATION, partnerType,
-				fofoOrder.getCreateTimestamp(), false));
+					fofoOrder.getCreateTimestamp(), false));
-		allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.INVESTMENT, partnerType,
+			allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.INVESTMENT, partnerType,
-				fofoOrder.getCreateTimestamp(), false));
+					fofoOrder.getCreateTimestamp(), false));
-		allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.CATEGORY, partnerType,
+			allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.CATEGORY, partnerType,
-				fofoOrder.getCreateTimestamp(), false));
+					fofoOrder.getCreateTimestamp(), false));
-		for (InventoryItem inventoryItem : inventoryItems) {
+			for (InventoryItem inventoryItem : inventoryItems) {
-			float itemCashback = 0;
+				float itemCashback = 0;
-			Set<Integer> schemeIds = new HashSet<>(
+				Set<Integer> schemeIds = new HashSet<>(
-					schemeItemRepository.selectSchemeIdByItemId(inventoryItem.getItemId()));
+						schemeItemRepository.selectSchemeIdByItemId(inventoryItem.getItemId()));
-			allActiveSchemes = allActiveSchemes.stream().filter(x -> schemeIds.contains(x.getId()))
+				allActiveSchemes = allActiveSchemes.stream().filter(x -> schemeIds.contains(x.getId()))
-					.collect(Collectors.toList());
+						.collect(Collectors.toList());
-			for (Scheme scheme : allActiveSchemes) {
+				for (Scheme scheme : allActiveSchemes) {
-				itemCashback += this.createSchemeInOut(scheme, inventoryItem);
+					itemCashback += this.createSchemeInOut(scheme, inventoryItem);
-			}
+				}
-			if (itemCashback > 0) {
+				if (itemCashback > 0) {
-				count++;
+					count++;
-				totalCashback += itemCashback;
+					totalCashback += itemCashback;
-			}
+				}
-		}
+			}
-		if (count > 0) {
+			if (count > 0) {
-			walletService.addAmountToWallet(retailerId, fofoOrderId, WalletReferenceType.SCHEME_OUT,
+				walletService.addAmountToWallet(retailerId, fofoOrderId, WalletReferenceType.SCHEME_OUT,
-					"Sales margin for invoice number " + fofoOrder.getInvoiceNumber() + ". Total " + count + " pc(s)",
+						"Sales margin for invoice number " + fofoOrder.getInvoiceNumber() + ". Total " + count + " pc(s)",
-					totalCashback, fofoOrder.getCreateTimestamp());
+						totalCashback, fofoOrder.getCreateTimestamp());
-			fofoOrder.setCashback(totalCashback);
+				fofoOrder.setCashback(totalCashback);
-			fofoOrderRepository.persist(fofoOrder);
+				fofoOrderRepository.persist(fofoOrder);
+			}
+		}
+	}
 	@Override
 	public void rollbackSchemes(List<Integer> inventoryItemIds, int rollbackReference, String rollbackReason)

Subversion Repositories SmartDukaan

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