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

 	private PurchaseRepository purchaseRepository;
 	@Autowired
 	private FofoOrderRepository fofoOrderRepository;
+	private static final List<SchemeType> ACTIVATION_SCHEME_TYPES = Arrays.asList(SchemeType.ACTIVATION, SchemeType.SPECIAL_SUPPORT);
 	@Override
 	public void saveScheme(int creatorId, CreateSchemeRequest createSchemeRequest) throws ProfitMandiBusinessException {
 		this.validateCreateSchemeRequest(createSchemeRequest);
 		 * SchemeType.OUT) { this.processPreviousSales(scheme); }
 		 */
+	}
 	private void sendSchemeNotification(Scheme scheme) throws ProfitMandiBusinessException {
-		if (Arrays.asList(SchemeType.SPECIAL_SUPPORT, SchemeType.ACTIVATION).contains(scheme.getType())) {
+		if (ACTIVATION_SCHEME_TYPES.contains(scheme.getType())) {
 			SendNotificationModel sendNotificationModel = new SendNotificationModel();
 			List<SchemeItem> schemeItems = schemeItemRepository.selectBySchemeIds(Collections.singleton(scheme.getId()));
 			Set<Integer> catalogIds = schemeItems.stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
 			List<String> itemDescriptions = itemRepository.selectAllByCatalogIds(catalogIds).stream().filter(Utils.distinctByKey(Item::getCatalogItemId))
 						sio.setStatus(SchemePayoutStatus.REJECTED);
 						sio.setStatusDescription("Partner Category upgraded to " + scheme.getPartnerType() + ", new entry for margin added");
+					}
 					actualCredit = amountToCredit - amountCredited;
 				} else {
+					return 0;            //Rejected Scheme for types INVESTMENT and ACTIVATION are considered rolledback only if the item billing is cancelled.
-					return 0;
+				}
 			} else {
 				actualCredit = amountToCredit;
+			}
 			LOGGER.info("Actual Credit ==== {}", actualCredit);
 				schemeInOut.setStatus(SchemePayoutStatus.PENDING);
 				schemeInOut.setStatusDescription("Subject to investment days maintained");
 				return 0;
 			} else {
 				schemeInOut.setStatus(SchemePayoutStatus.CREDITED);
+				schemeInOut.setCreditTimestamp(LocalDateTime.now());
 				if (scheme.getType().equals(SchemeType.IN)) {
 					schemeInOut.setStatusDescription("Credited for GRN of IMEI#" + inventoryItem.getSerialNumber());
 				} else if (SchemeService.OUT_SCHEME_TYPES.contains(scheme.getType())) {
 					schemeInOut.setStatusDescription("Credited for sale of IMEI#" + inventoryItem.getSerialNumber());
+				}
-				schemeInOut.setCreditTimestamp(LocalDateTime.now());
+			}
+		}
 		return actualCredit;
+	}
 	private float getAmount(InventoryItem inventoryItem, Scheme scheme) throws ProfitMandiBusinessException {
 		float amount = 0;
 		float dpForCalc = 0;
 		float taxableSellingPrice = 0;
-		float totalTaxRate = stateGstRateRepository.getTotalTaxRate(inventoryItem.getItemId());
+		//float totalTaxRate = stateGstRateRepository.getTotalTaxRate(inventoryItem.getItemId());
-		if (scheme.getAmountType() == AmountType.PERCENTAGE) {
+		if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
 			if (scheme.getType().equals(SchemeType.IN)) {
 				dpForCalc = inventoryItem.getUnitPrice() - inventoryItem.getPriceDropAmount();
 			} else {
 				try {
 					dpForCalc = Math.min(inventoryItem.getUnitPrice() - inventoryItem.getPriceDropAmount(),
 				} catch (Exception e) {
 					LOGGER.info("Could not find tag Listing entry in {}", inventoryItem.getItemId());
 					e.printStackTrace();
+				}
+			}
+			//TODO:Should be calculated on unit price
-			taxableSellingPrice = dpForCalc / (1 + totalTaxRate / 100);
+			//taxableSellingPrice = dpForCalc / (1 + totalTaxRate / 100);
-			amount = taxableSellingPrice * scheme.getAmount() / 100;
+			//amount = taxableSellingPrice * scheme.getAmount() / 100;
+			amount = dpForCalc * scheme.getAmount() / 100;
 			System.out.println(String.format("%d\t%s\t%d\t%d\t%s\t%s\t%s\t%s\t%f\t%f\t%f\t%f", inventoryItem.getId(),
 					inventoryItem.getSerialNumber(), inventoryItem.getItemId(), scheme.getId(), scheme.getName(),
 					scheme.getType(), scheme.getAmountType(), scheme.getPartnerType(), dpForCalc, taxableSellingPrice,
 					scheme.getAmount(), amount));
-		} else {
+		} else if (scheme.getType().equals(SchemeType.IN)) {
 			amount = scheme.getAmount();
-			if (scheme.isBasePlusGstCalc()) {
-				amount = this.getReversalAmount(scheme, inventoryItem);
-			}
-			System.out.println(String.format("%d\t%s\t%d\t%d\t%s\t%s\t%s\t%s\t%f\t%f\t%d\t%f", inventoryItem.getId(),
-					inventoryItem.getSerialNumber(), inventoryItem.getItemId(), scheme.getId(), scheme.getName(),
-					scheme.getType(), scheme.getAmountType(), scheme.getPartnerType(), dpForCalc, taxableSellingPrice,
-, amount));
+		}
 		return amount;
+	}
-	//Specifically for SchemeReversal
-	private float getReversalAmount(Scheme scheme, InventoryItem inventoryItem) {
-		float amount = scheme.getAmount();
-		if (scheme.isBasePlusGstCalc()) {
-			amount = (float) (amount / 1.18);
-		}
-		List<SchemeInOut> sios = schemeInOutRepository.selectAll(inventoryItem.getId());
-		sios = sios.stream().filter(x -> x.getRolledBackTimestamp() == null).collect(Collectors.toList());
-		List<Integer> schemeIds = sios.stream().map(x -> x.getSchemeId()).collect(Collectors.toList());
-		List<Scheme> schemes = schemeRepository.selectBySchemeIds(schemeIds);
-		float totalPaidPercentage = schemes.stream().filter(x -> x.getAmountType().equals(AmountType.PERCENTAGE)).map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x)).floatValue();
-		return totalPaidPercentage;
-	}
 	@Override
 	public float processSchemeOut(int fofoOrderId, int retailerId) throws ProfitMandiBusinessException {
 		float totalCashback = 0;
 		FofoOrder fofoOrder = fofoOrderRepository.selectByFofoIdAndOrderId(retailerId, fofoOrderId);
 		// Process only if order is not cancelled
+			}
 			int count = 0;
 			List<SchemeType> allOutSchemeTypes = new ArrayList<>();
-			allOutSchemeTypes.addAll(Arrays.asList(SchemeType.ACTIVATION, SchemeType.INVESTMENT));
+			allOutSchemeTypes.addAll(Arrays.asList(SchemeType.ACTIVATION, SchemeType.INVESTMENT, SchemeType.SPECIAL_SUPPORT));
 			allOutSchemeTypes.addAll(OUT_SCHEME_TYPES);
-			allOutSchemeTypes.add(SchemeType.SPECIAL_SUPPORT);
 			List<Scheme> allActiveSchemes = schemeRepository.selectActiveAll(allOutSchemeTypes, partnerType,
 					fofoOrder.getCreateTimestamp(), false);
 			for (InventoryItem inventoryItem : inventoryItems) {
 				float itemCashback = 0;
 				Set<Integer> schemeIds = new HashSet<>(
 						schemeItemRepository.selectSchemeIdByCatalogId(inventoryItem.getItem().getCatalogItemId()));
 				List<Scheme> itemActiveSchemes = allActiveSchemes.stream().filter(x -> schemeIds.contains(x.getId()))
 						.collect(Collectors.toList());
-				List<Scheme> supportSchemes = itemActiveSchemes.stream().filter(x -> x.getType().equals(SchemeType.SPECIAL_SUPPORT)).collect(Collectors.toList());
+				List<Scheme> supportSchemes = itemActiveSchemes.stream().filter(x -> Arrays.asList(SchemeType.SPECIAL_SUPPORT, SchemeType.ACTIVATION).contains(x.getType())).collect(Collectors.toList());
-				itemActiveSchemes = itemActiveSchemes.stream().filter(x -> !x.getType().equals(SchemeType.SPECIAL_SUPPORT)).collect(Collectors.toList());
+				itemActiveSchemes = itemActiveSchemes.stream().filter(x -> !(x.getType().equals(SchemeType.SPECIAL_SUPPORT))).collect(Collectors.toList());
 				for (Scheme scheme : itemActiveSchemes) {
 					LOGGER.info("Scheme ==== {}", scheme);
 					itemCashback += this.createSchemeInOut(scheme, inventoryItem);
+				}
 				if (supportSchemes.size() > 0) {
+		}
 		return totalCashback;
+	}
 	@Override
+	//Tax rate has been passed to 0 to ensure no tax deduction
-	public float getSpecialSupportAmount(float supportAmount, PartnerType partnerType, LocalDate onDate, int catalogId) throws ProfitMandiBusinessException {
+	public float getSpecialSupportAmount(float supportAmount, PartnerType partnerType, LocalDate onDate,
+										 int catalogId) throws ProfitMandiBusinessException {
-		int itemId = itemRepository.selectAllByCatalogItemId(catalogId).stream().findAny().get().getId();
+		//int itemId = itemRepository.selectAllByCatalogItemId(catalogId).stream().findAny().get().getId();
-		float totalTaxRate = stateGstRateRepository.getTotalTaxRate(itemId);
+		//float totalTaxRate = stateGstRateRepository.getTotalTaxRate(itemId);
-		return this.getSpecialSupportAmount(supportAmount, partnerType, onDate, catalogId, totalTaxRate);
+		return this.getSpecialSupportAmount(supportAmount, partnerType, onDate, catalogId, 0);
+	}
 	@Override
-	public float getSpecialSupportAmount(float supportAmount, PartnerType partnerType, LocalDate onDate, int catalogId, float taxRate) throws ProfitMandiBusinessException {
+	public float getSpecialSupportAmount(float supportAmount, PartnerType partnerType, LocalDate onDate,
+										 int catalogId, float taxRate) throws ProfitMandiBusinessException {
 		float totalMargin = this.selectPercentageScheme(partnerType, onDate, catalogId, false, 0, 0).stream().collect(Collectors.summingDouble(x -> x.getAmount())).floatValue();
 		float amountToCredit = supportAmount * (1 - (totalMargin / (100 + taxRate)));
 		return amountToCredit;
+	}
+	private void processSpecialSupport(FofoOrder fofoOrder, List<Scheme> supportSchemes, InventoryItem
-	private void processSpecialSupport(FofoOrder fofoOrder, List<Scheme> supportSchemes, InventoryItem inventoryItem, PartnerType partnerType, LocalDateTime saleDate) throws ProfitMandiBusinessException {
+			inventoryItem, PartnerType partnerType, LocalDateTime saleDate) throws ProfitMandiBusinessException {
 		int catalogId = inventoryItem.getItem().getCatalogItemId();
 		float totalMargin = this.selectPercentageScheme(partnerType, saleDate.toLocalDate(), catalogId, false, 0, 0).stream().collect(Collectors.summingDouble(x -> x.getAmount())).floatValue();
 		LOGGER.info("total percentage margin - {}", totalMargin);
-		float totalTaxRate = stateGstRateRepository.getTotalTaxRate(inventoryItem.getItemId());
 		for (Scheme scheme : supportSchemes) {
-			/*if (scheme.isBasePlusGstCalc()) {
-			}*/
-			float amountToCredit = scheme.getAmount() * (1 - (totalMargin / (100 + totalTaxRate)));
+			float amountToCredit = scheme.getAmount() * (1 - (totalMargin / 100));
 			List<SchemeInOut> schemeInOuts = schemeInOutRepository.selectByScheme(scheme.getId(), inventoryItem.getId());
 			SchemeInOut schemeInOut = schemeInOuts.stream().filter(x -> x.getRolledBackTimestamp() == null).findFirst().orElse(null);
 			if (schemeInOut == null) {
 				schemeInOut = new SchemeInOut();
 				schemeInOut.setSchemeId(scheme.getId());
 				if (scheme.getAmountType().equals(AmountType.FIXED)) {
 					continue;
+				}
 				if (scheme.getType().equals(SchemeType.IN) && schemeInOut.getRolledBackTimestamp() == null) {
 					float newAmount = getAmount(ii, scheme);
-					if (schemeInOut.getAmount() - newAmount >= 0.01f) {
+					if (Math.abs(schemeInOut.getAmount() - newAmount) >= 0.01f) {
 						schemeInOut.setRolledBackTimestamp(LocalDateTime.now());
 						SchemeInOut sioNew = new SchemeInOut();
 						sioNew.setAmount(newAmount);
 						sioNew.setStatus(schemeInOut.getStatus());
 						sioNew.setStatusDescription(schemeInOut.getStatusDescription());
 						sioNew.setInventoryItemId(schemeInOut.getInventoryItemId());
 						sioNew.setSchemeId(schemeInOut.getSchemeId());
+						sioNew.setCreditTimestamp(LocalDateTime.now());
 						schemeInOutRepository.persist(sioNew);
 						schemeInOut.setStatus(SchemePayoutStatus.REJECTED);
 						schemeInOut.setStatusDescription("Change in margins due to price drop");
 						// IF not credited then dont consider any credit/debit for that sio entry

Subversion Repositories SmartDukaan

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