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

                     purchase.getPurchaseReference(), itemsCount);
+        }
+    }
-    public InventoryPayoutModel getPayouts(InventoryItem inventoryItem) {
+    public InventoryPayoutModel getPayouts(InventoryItem inventoryItem) throws ProfitMandiBusinessException {
         double paidPercentage = 0d;
         double paidFixed = 0d;
         double totalPaid = 0d;
+        double dp = Math.min(inventoryItem.getUnitPrice() - Math.max(0, inventoryItem.getPriceDropAmount()),
+                tagListingRepository.selectByItemId(inventoryItem.getItemId()).getSellingPrice());
         List<SchemeInOut> sios = schemeInOutRepository.selectAll(inventoryItem.getId());
         List<SchemeInOut> paidSios = sios.stream().filter(x -> x.getRolledBackTimestamp() == null).filter(x -> x.getStatus().equals(SchemePayoutStatus.CREDITED)).collect(Collectors.toList());
         if (paidSios.size() > 0) {
             List<Integer> schemeIds = sios.stream().map(x -> x.getSchemeId()).collect(Collectors.toList());
         InventoryPayoutModel inventoryPayoutModel = new InventoryPayoutModel(inventoryItem.getId(), paidSios, offerPayouts);
         inventoryPayoutModel.setFixedAmount(paidFixed);
         inventoryPayoutModel.setPaidAmount(totalPaid);
         inventoryPayoutModel.setPercentageAmount(paidPercentage);
+        inventoryPayoutModel.setDp(dp);
         return inventoryPayoutModel;
+    }
     // We are maintaining price drop after grn
     private float getAmount(InventoryItem inventoryItem, Scheme scheme) throws ProfitMandiBusinessException {
+            }
             walletCredit += fixedRollout;
+        }
         if (percentageToPay > 0) {
-            double effectiveDP = inventoryItem.getUnitPrice() - Math.max(0, inventoryItem.getPriceDropAmount()) - (inventoryPayoutModel.getFixedAmount() + fixedToPay);
+            double effectiveDP = inventoryPayoutModel.getDp() - (inventoryPayoutModel.getFixedAmount() + fixedToPay);
             double totalPercentage = inventoryPayoutModel.getPercentageAmount() + percentageToPay;
             double percentageRollout = effectiveDP * (totalPercentage / (100 + totalPercentage) - (inventoryPayoutModel.getPercentageAmount() / (100 + inventoryPayoutModel.getPercentageAmount())));
             for (Map.Entry<SchemeSummaryModel, AmountModel> schemeSummaryModelAmountModelEntry : payoutSchemeSummaryModelMap.entrySet()) {
                 SchemeSummaryModel schemeSummaryModel = schemeSummaryModelAmountModelEntry.getKey();
                 AmountModel amountModel = schemeSummaryModelAmountModelEntry.getValue();
                 .selectBySerialNumbers(new ArrayList<>(serialNumberMap.keySet())).stream().collect(Collectors.toList());
         Map<String, ActivatedImei> activatedImeiMap = activatedImeis.stream()
                 .collect(Collectors.toMap(x -> x.getSerialNumber().toLowerCase(), x -> x));
         for (SchemeInOut pendingPayout : pendingPayouts) {
+            Scheme scheme = schemesMap.get(pendingPayout.getSchemeId());
             InventoryItem ii = inventoryItemMap.get(pendingPayout.getInventoryItemId());
+            InventoryPayoutModel inventoryPayoutModel = this.getPayouts(ii);
+            AmountModel amountModel = new AmountModel();
+            amountModel.setAmount(scheme.getAmount());
+            amountModel.setAmountType(scheme.getAmountType());
+            double amountToRollout = this.getAmount(inventoryPayoutModel, amountModel);
             String serialNumber = ii.getSerialNumber().toLowerCase();
             ActivatedImei activatedImei = activatedImeiMap.get(serialNumber);
             if (activatedImei == null) {
                 continue;
+            }
-            Scheme scheme = schemesMap.get(pendingPayout.getSchemeId());
             if (scheme.isWithinRange(activatedImei.getActivationTimestamp())) {
                 int fofoId = ii.getFofoId();
                 // Get latest order Id
                 int orderId = scanRecordRepository.selectByInventoryItemId(ii.getId()).stream()
                         .filter(x -> x.getOrderId() > 0)
                         .sorted(Comparator.comparing(ScanRecord::getCreateTimestamp).reversed()).findFirst().get()
                         .getOrderId();
                 FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(orderId);
                 if (scheme.getType().equals(SchemeType.ACTIVATION)) {
                     walletService.addAmountToWallet(fofoId, orderId, WalletReferenceType.ACTIVATION_SCHEME,
-                            "Activation margin for " + ii.getItem().getItemDescriptionNoColor() + ", Imei - " + serialNumber, pendingPayout.getAmount(),
+                            "Activation margin for " + ii.getItem().getItemDescriptionNoColor() + ", Imei - " + serialNumber, (float) amountToRollout,
                             fofoOrder.getCreateTimestamp());
                     pendingPayout.setStatusDescription("Activation margin credited, activated on " + FormattingUtils.formatDate(activatedImei.getActivationTimestamp()));
                 } else {
                     walletService.addAmountToWallet(fofoId, orderId, WalletReferenceType.SPECIAL_SUPPORT,
-                            "Special Support for " + ii.getItem().getItemDescriptionNoColor() + ", Imei - " + serialNumber, pendingPayout.getAmount(),
+                            "Special Support for " + ii.getItem().getItemDescriptionNoColor() + ", Imei - " + serialNumber, (float) amountToRollout,
                             fofoOrder.getCreateTimestamp());
                     pendingPayout.setStatusDescription("Special support credited, activated on " + FormattingUtils.formatDate(activatedImei.getActivationTimestamp()));
+                }
                 pendingPayout.setCreditTimestamp(LocalDateTime.now());
                 pendingPayout.setStatus(SchemePayoutStatus.CREDITED);
                         "Rejected, activated on " + FormattingUtils.formatDate(activatedImei.getActivationTimestamp()));
+            }
+        }
+    }
+    private double getAmount(InventoryPayoutModel inventoryPayoutModel, AmountModel amountModel) {
+        double rollout = 0;
+        if (amountModel.getAmountType().equals(AmountType.PERCENTAGE)) {
+            double effectiveDp = inventoryPayoutModel.getDp() - inventoryPayoutModel.getFixedAmount();
+            double totalPercentage = inventoryPayoutModel.getPercentageAmount() + amountModel.getAmount();
+            rollout = effectiveDp * (totalPercentage / (100 + totalPercentage) - (inventoryPayoutModel.getPercentageAmount() / (100 + inventoryPayoutModel.getPercentageAmount())));
+        } else {
+            rollout = amountModel.getAmount() * (100 / (100 + inventoryPayoutModel.getPercentageAmount()));
+        }
+        return rollout;
+    }
     @Override
     public void processActivatedImeisForSchemes() throws ProfitMandiBusinessException {
         List<SchemesImeisModel> schemesImeisModels = schemeRepository.selectSelectUnpaidSchemes();
         LOGGER.info("Total Size - " + schemesImeisModels.size());
         List<Integer> orderIds = schemesImeisModels.stream().map(x -> x.getOrderId()).collect(Collectors.toList());

Subversion Repositories SmartDukaan

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