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

                 inventoryItems = inventoryItems.stream().filter(x -> !agedSerialNumbers.contains(x.getSerialNumber())).collect(Collectors.toSet());
+            }
             if (inventoryItems.size() == 0) return 0;
-            Map<Integer, List<InventoryItem>> catalogInventoryItemMap = inventoryItems.stream().collect(Collectors.groupingBy(x -> x.getItem().getCatalogItemId()));
+            // Resolve GRN billing date per inventory item: InventoryItem.purchaseId -> Purchase.purchaseReference -> Order.billingTimestamp.
-            Map<CatalogSummaryModel, List<SchemeSummaryModel>> catalogSchemeSummaryMap = tagListingRepository.getModelSchemesByCatalogIdsAndType(retailerId,
+            // Scheme resolution for OUT must use each item's own GRN billing date, not fofoOrder.createTimestamp.
-                    partnerType, new ArrayList<>(catalogInventoryItemMap.keySet()), fofoOrder.getCreateTimestamp());
+            Set<Integer> purchaseIds = inventoryItems.stream().map(InventoryItem::getPurchaseId).collect(Collectors.toSet());
+            Map<Integer, LocalDateTime> purchaseBillingDateMap = new HashMap<>();
+            for (Integer purchaseId : purchaseIds) {
+                purchaseBillingDateMap.put(purchaseId, purchaseService.getBillingDateOfPurchase(purchaseId));
+            }
+            // Group items by (GRN billingDate -> catalogId -> items). Items with identical GRN billing date share a scheme lookup.
+            Map<LocalDateTime, Map<Integer, List<InventoryItem>>> billingDateCatalogItemsMap = inventoryItems.stream()
+                    .collect(Collectors.groupingBy(
-            LOGGER.info("catalogSchemeSummaryMap - {}", catalogSchemeSummaryMap);
+                            x -> purchaseBillingDateMap.get(x.getPurchaseId()),
+                            Collectors.groupingBy(x -> x.getItem().getCatalogItemId())));
             // N+1 fix: Batch fetch all SchemeInOut records for all inventoryItems at once
             Set<Integer> allInventoryItemIds = inventoryItems.stream().map(InventoryItem::getId).collect(Collectors.toSet());
             List<SchemeInOut> allSchemeInOuts = schemeInOutRepository.selectByInventoryItemIds(allInventoryItemIds);
             Map<Integer, List<SchemeInOut>> schemeInOutByInventoryItemId = allSchemeInOuts.stream()
                     .collect(Collectors.groupingBy(SchemeInOut::getInventoryItemId));
             int count = 0;
+            for (Map.Entry<LocalDateTime, Map<Integer, List<InventoryItem>>> billingDateEntry : billingDateCatalogItemsMap.entrySet()) {
+                LocalDateTime grnBillingDate = billingDateEntry.getKey();
+                Map<Integer, List<InventoryItem>> catalogInventoryItemMap = billingDateEntry.getValue();
+                Map<CatalogSummaryModel, List<SchemeSummaryModel>> catalogSchemeSummaryMap = tagListingRepository.getModelSchemesByCatalogIdsAndType(retailerId,
+                        partnerType, new ArrayList<>(catalogInventoryItemMap.keySet()), grnBillingDate);
+                LOGGER.info("catalogSchemeSummaryMap (grnBillingDate={}) - {}", grnBillingDate, catalogSchemeSummaryMap);
-            for (Map.Entry<CatalogSummaryModel, List<SchemeSummaryModel>> catalogSummaryModelListEntry : catalogSchemeSummaryMap.entrySet()) {
+                for (Map.Entry<CatalogSummaryModel, List<SchemeSummaryModel>> catalogSummaryModelListEntry : catalogSchemeSummaryMap.entrySet()) {
-                CatalogSummaryModel catalogSummaryModel = catalogSummaryModelListEntry.getKey();
+                    CatalogSummaryModel catalogSummaryModel = catalogSummaryModelListEntry.getKey();
-                List<SchemeSummaryModel> schemeSummaryModels = catalogSummaryModelListEntry.getValue().stream().filter(x -> x != null).collect(Collectors.toList());
+                    List<SchemeSummaryModel> schemeSummaryModels = catalogSummaryModelListEntry.getValue().stream().filter(x -> x != null).collect(Collectors.toList());
-                schemeSummaryModels.stream().filter(x -> x.getSchemeType().getTransactionType().equals(StockTransactionType.OUT)).forEach(x -> x.setProcess(true));
+                    schemeSummaryModels.stream().filter(x -> x.getSchemeType().getTransactionType().equals(StockTransactionType.OUT)).forEach(x -> x.setProcess(true));
-                if (schemeSummaryModels.stream().filter(x -> x.isProcess()).count() == 0) continue;
+                    if (schemeSummaryModels.stream().filter(x -> x.isProcess()).count() == 0) continue;
-                // Create map once per catalog instead of per inventoryItem
+                    // Create map once per catalog instead of per inventoryItem
-                Map<Integer, SchemeSummaryModel> schemeSummaryModelMap = schemeSummaryModels.stream().collect(Collectors.toMap(x -> x.getSchemeId(), x -> x));
+                    Map<Integer, SchemeSummaryModel> schemeSummaryModelMap = schemeSummaryModels.stream().collect(Collectors.toMap(x -> x.getSchemeId(), x -> x));
-                List<InventoryItem> modelInventoryItems = catalogInventoryItemMap.get(catalogSummaryModel.getCatalogId());
+                    List<InventoryItem> modelInventoryItems = catalogInventoryItemMap.get(catalogSummaryModel.getCatalogId());
-                for (InventoryItem inventoryItem : modelInventoryItems) {
+                    for (InventoryItem inventoryItem : modelInventoryItems) {
                     // N+1 fix: Use pre-fetched schemeInOut map instead of querying per inventoryItem
                     List<SchemeInOut> sios = schemeInOutByInventoryItemId.getOrDefault(inventoryItem.getId(), Collections.emptyList());
                     List<Integer> creditedSchemeIds = sios.stream()
                             .filter(x -> x.getStatus().equals(SchemePayoutStatus.CREDITED))
                     if (inventoryItemCashback > 0 || sioRejectedValue > 0) {
                         count++;
                         totalCashback += inventoryItemCashback - sioRejectedValue;
+                    }
+                }
+                }
+            }
             if (count > 0) {
                 walletService.addAmountToWallet(
                         retailerId, fofoOrderId, WalletReferenceType.SCHEME_OUT, "Sales margin for invoice number "
+        }
+    }
     @Override
-    public double getTotalMargin(int itemId, PartnerType partnerType, LocalDateTime dateTime) {
-        Session session = sessionFactory.getCurrentSession();
-        CriteriaBuilder cb = session.getCriteriaBuilder();
-        CriteriaQuery<Double> criteriaQuery = cb.createQuery(Double.class);
-        Root<SchemeItem> schemeItem = criteriaQuery.from(SchemeItem.class);
-        Root<Scheme> scheme = criteriaQuery.from(Scheme.class);
-        Predicate schemePredicate = cb.equal(scheme.get(ProfitMandiConstants.AMOUNT_TYPE), AmountType.PERCENTAGE);
-        Predicate lessThanPredicate = cb.lessThanOrEqualTo(scheme.get(ProfitMandiConstants.END_DATE_TIME), dateTime);
-        Predicate greaterThanPredicate = cb.greaterThanOrEqualTo(scheme.get(ProfitMandiConstants.START_DATE_TIME),
-                dateTime);
-        Predicate joinPredicate = cb.equal(scheme.get("id"), schemeItem.get("schemeId"));
-        Predicate schemeItemPredicate = cb.equal(schemeItem.get(ProfitMandiConstants.ITEM_ID), itemId);
-        criteriaQuery.select(cb.sum(scheme.get(ProfitMandiConstants.AMOUNT))).where(schemePredicate, lessThanPredicate,
-                greaterThanPredicate, schemeItemPredicate, joinPredicate);
-        Query<Double> query = session.createQuery(criteriaQuery);
-        return query.getSingleResult() + ProfitMandiConstants.SCHEME_INVESTMENT_MARGIN;
-    }
-    @Override
     public Map<Integer, Float> getCatalogSchemeCashBack(int fofoId, List<Integer> catalogIds) throws
             ProfitMandiBusinessException {
         PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoId, LocalDate.now());
         Map<CatalogSummaryModel, List<SchemeSummaryModel>> catalogModelMap = tagListingRepository.getModelSchemesByCatalogIdsAndType(fofoId, partnerType, catalogIds, LocalDate.now().atStartOfDay());
                     schemeInOutRepository.persist(sio);
+                }
+            }
+        }
+    }
+    @Override
+    public void updateSchemeItemWindow(long schemeItemId, LocalDateTime startDate, LocalDateTime endDate, int updatedBy)
+            throws ProfitMandiBusinessException {
+        SchemeItem item = schemeItemRepository.selectById(schemeItemId);
+        if (item == null) {
+            throw new ProfitMandiBusinessException("schemeItemId", String.valueOf(schemeItemId), "Scheme item not found");
+        }
+        Scheme scheme = schemeRepository.selectById(item.getSchemeId());
+        if (scheme == null) {
+            throw new ProfitMandiBusinessException("schemeId", String.valueOf(item.getSchemeId()), "Scheme not found");
+        }
+        if (startDate.isAfter(endDate)) {
+            throw new ProfitMandiBusinessException("startDate, endDate",
+                    FormattingUtils.formatDate(startDate) + ", " + FormattingUtils.formatDate(endDate),
+                    "Start date must be before end date");
+        }
+        // Containment: item window must be within scheme window
+        if (startDate.isBefore(scheme.getStartDateTime()) || endDate.isAfter(scheme.getEndDateTime())) {
+            throw new ProfitMandiBusinessException("startDate, endDate",
+                    FormattingUtils.formatDate(startDate) + ", " + FormattingUtils.formatDate(endDate),
+                    "Item dates must be within scheme window ["
+                            + FormattingUtils.formatDate(scheme.getStartDateTime()) + " - "
+                            + FormattingUtils.formatDate(scheme.getEndDateTime()) + "]");
+        }
+        // Non-overlap check within same (catalogId, schemeId)
+        if (schemeItemRepository.existsOverlapping(item.getCatalogId(), item.getSchemeId(), startDate, endDate, item.getId())) {
+            throw new ProfitMandiBusinessException("startDate, endDate",
+                    FormattingUtils.formatDate(startDate) + ", " + FormattingUtils.formatDate(endDate),
+                    "Date range overlaps with existing entry for this model in this scheme");
+        }
+        item.setStartDate(startDate);
+        item.setEndDate(endDate);
+        item.setUpdatedBy(updatedBy);
+        item.setUpdatedOn(LocalDateTime.now());
+        schemeItemRepository.persist(item);
+    }
+    @Override
+    public SchemeItem addSchemeItemWithDates(int schemeId, int catalogId, LocalDateTime startDate, LocalDateTime endDate, int createdBy)
+            throws ProfitMandiBusinessException {
+        Scheme scheme = schemeRepository.selectById(schemeId);
+        if (scheme == null) {
+            throw new ProfitMandiBusinessException("schemeId", String.valueOf(schemeId), "Scheme not found");
+        }
+        if (startDate.isAfter(endDate)) {
+            throw new ProfitMandiBusinessException("startDate, endDate",
+                    FormattingUtils.formatDate(startDate) + ", " + FormattingUtils.formatDate(endDate),
+                    "Start date must be before end date");
+        }
+        // Containment
+        if (startDate.isBefore(scheme.getStartDateTime()) || endDate.isAfter(scheme.getEndDateTime())) {
+            throw new ProfitMandiBusinessException("startDate, endDate",
+                    FormattingUtils.formatDate(startDate) + ", " + FormattingUtils.formatDate(endDate),
+                    "Item dates must be within scheme window ["
+                            + FormattingUtils.formatDate(scheme.getStartDateTime()) + " - "
+                            + FormattingUtils.formatDate(scheme.getEndDateTime()) + "]");
+        }
+        // Non-overlap
+        if (schemeItemRepository.existsOverlapping(catalogId, schemeId, startDate, endDate, 0)) {
+            throw new ProfitMandiBusinessException("startDate, endDate",
+                    FormattingUtils.formatDate(startDate) + ", " + FormattingUtils.formatDate(endDate),
+                    "Date range overlaps with existing entry for this model in this scheme");
+        }
+        SchemeItem item = new SchemeItem();
+        item.setSchemeId(schemeId);
+        item.setCatalogId(catalogId);
+        item.setStartDate(startDate);
+        item.setEndDate(endDate);
+        item.setCreateTimestamp(LocalDateTime.now());
+        item.setUpdatedBy(createdBy);
+        item.setUpdatedOn(LocalDateTime.now());
+        schemeItemRepository.persist(item);
+        return item;
+    }
+    @Override
+    public List<SchemeItem> clampSchemeItems(int schemeId, LocalDateTime newStart, LocalDateTime newEnd, int updatedBy)
+            throws ProfitMandiBusinessException {
+        List<SchemeItem> outsideItems = schemeItemRepository.selectItemsOutsideWindow(schemeId, newStart, newEnd);
+        List<SchemeItem> clamped = new ArrayList<>();
+        for (SchemeItem item : outsideItems) {
+            LocalDateTime clampedStart = item.getStartDate().isBefore(newStart) ? newStart : item.getStartDate();
+            LocalDateTime clampedEnd = item.getEndDate().isAfter(newEnd) ? newEnd : item.getEndDate();
+            if (clampedStart.isAfter(clampedEnd) || clampedStart.isEqual(clampedEnd)) {
+                throw new ProfitMandiBusinessException("schemeId, catalogId",
+                        schemeId + ", " + item.getCatalogId(),
+                        "Cannot clamp: item window for catalogId " + item.getCatalogId()
+                                + " (" + FormattingUtils.formatDate(item.getStartDate()) + " - " + FormattingUtils.formatDate(item.getEndDate()) + ")"
+                                + " falls entirely outside new scheme window ("
+                                + FormattingUtils.formatDate(newStart) + " - " + FormattingUtils.formatDate(newEnd)
+                                + "). Adjust this item first.");
+            }
+            item.setStartDate(clampedStart);
+            item.setEndDate(clampedEnd);
+            item.setUpdatedBy(updatedBy);
+            item.setUpdatedOn(LocalDateTime.now());
+            schemeItemRepository.persist(item);
+            clamped.add(item);
+        }
+        return clamped;
+    }
+}

Subversion Repositories SmartDukaan

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