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

+    }
     private boolean checkGiftAvailability(LocalDate date, int perDayMaxQty, OfferEntity offer) {
         GiftEntity defaultGift = giftRepository.getDefaultGift(offer.getId());
+        // No default gift configured -> no default-gift daily cap to enforce.
+        // Return true so the caller skips the fallback and proceeds to the picker.
-        if (defaultGift == null) return false;
+        if (defaultGift == null) return true;
         Integer giftCounts = scratchOfferRepository.countTodaysGiftDistribution(date.atStartOfDay(), date.atTime(LocalTime.MAX), defaultGift.getId());
         return giftCounts < perDayMaxQty;
+    }
     private boolean isAppleItem(FofoOrder fofoOrder) {
         if (allGifts.isEmpty()) {
             logger.warn("Offer {} has no gifts", offer.getId());
             return false;
+        }
+        // Compute cart amount + item categories up-front so both the fast-paths (Apple,
+        // daily-limit) and the main picker can consult them when deciding fallbacks.
+        List<FofoOrderItem> orderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
+        Set<Integer> itemCategoryIds = new HashSet<>();
+        for (FofoOrderItem orderItem : orderItems) {
+            try {
+                Item item = itemRepository.selectById(orderItem.getItemId());
+                if (item != null) {
+                    itemCategoryIds.add(item.getCategoryId());
+                }
+            } catch (ProfitMandiBusinessException e) {
+                logger.warn("Item {} not found", orderItem.getItemId());
+            }
+        }
+        float totalAmount = fofoOrder.getTotalAmount();
         // Apple items always get the last gift
         if (isAppleItem(fofoOrder)) {
             GiftEntity lastGift = allGifts.get(allGifts.size() - 1);
             if (lastGift.getMaxRedemptions() > 0) {
                 createScratchOffer(fofoOrder, offer, lastGift);
                 createBetterLuckNextTimeScratch(fofoOrder, offer);
+            }
             return true;
+        }
-        // Check daily limit
+        // Check daily limit — if the default-gift daily cap is hit, we still need to
+        // honour the default gift's own slab bounds (management rule: default EW must
+        // not be awarded above its own max_cart_value, e.g. above 20K).
         if (!checkGiftAvailability(LocalDate.now(), offer.getUserLimit(), offer)) {
-            createDefaultGiftScratch(fofoOrder, offer, defaultGift);
+            awardDefaultOrBlnt(fofoOrder, offer, defaultGift, totalAmount, itemCategoryIds,
+                    "daily-limit-reached");
             return true;
+        }
         // Find eligible gifts by cart value and category
-        List<FofoOrderItem> orderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
-        Set<Integer> itemCategoryIds = new HashSet<>();
-        for (FofoOrderItem orderItem : orderItems) {
-            try {
-                Item item = itemRepository.selectById(orderItem.getItemId());
-                if (item != null) {
-                    itemCategoryIds.add(item.getCategoryId());
-                }
-            } catch (ProfitMandiBusinessException e) {
-                logger.warn("Item {} not found", orderItem.getItemId());
-            }
-        }
-        float totalAmount = fofoOrder.getTotalAmount();
         List<GiftEntity> allOfferGifts = giftRepository.findByOfferId(offer.getId());
         List<GiftEntity> eligibleGifts = allOfferGifts.stream()
                 .filter(gift -> gift.getMaxRedemptions() > 0
                         && totalAmount >= gift.getMinCartValue()
                         && totalAmount <= gift.getMaxCartValue()
                         && itemCategoryIds.stream().anyMatch(catId -> isItemCategoryEligible(gift.getProductCategory(), catId)))
                 .collect(Collectors.toList());
         if (eligibleGifts.isEmpty()) {
-            createDefaultGiftScratch(fofoOrder, offer, defaultGift);
+            awardDefaultOrBlnt(fofoOrder, offer, defaultGift, totalAmount, itemCategoryIds,
+                    "no-eligible-gifts");
             return true;
+        }
         GiftEntity selectedGift = selectGiftByClassification(offer, eligibleGifts, fofoOrder);
         if (selectedGift == null || selectedGift.getMaxRedemptions() <= 0) {
-            createDefaultGiftScratch(fofoOrder, offer, defaultGift);
+            awardDefaultOrBlnt(fofoOrder, offer, defaultGift, totalAmount, itemCategoryIds,
+                    "picker-returned-null-or-exhausted");
             return true;
+        }
         createScratchOffer(fofoOrder, offer, selectedGift);
         return true;
+    }
+    /**
+     * Fallback awarder that respects the default gift's own slab bounds and category.
+     * If the default gift is genuinely eligible for this cart (cart within its
+     * min/max, category matches, stock left), award it. Otherwise award Better Luck
+     * Next Time — this prevents the "EW awarded above 20K" management rule violation
+     * that could happen when a slab gap or exhausted pool caused the picker to fall
+     * through with no eligible gift.
+     */
+    private void awardDefaultOrBlnt(FofoOrder order, OfferEntity offer, GiftEntity defaultGift,
+                                    float totalAmount, Set<Integer> itemCategoryIds, String reason) {
+        // 1) Default gift — only if truly eligible for this cart (respects its slab).
+        boolean defaultEligible = defaultGift != null
+                && defaultGift.getMaxRedemptions() != null
+                && defaultGift.getMaxRedemptions() > 0
+                && defaultGift.getMinCartValue() != null
+                && defaultGift.getMaxCartValue() != null
+                && totalAmount >= defaultGift.getMinCartValue()
+                && totalAmount <= defaultGift.getMaxCartValue()
+                && itemCategoryIds.stream().anyMatch(catId ->
+                isItemCategoryEligible(defaultGift.getProductCategory(), catId));
+        if (defaultEligible) {
+            logger.info("Fallback fired for order {} ({}) — default gift {} eligible, awarding it",
+                    order.getId(), reason, defaultGift.getId());
+            createDefaultGiftScratch(order, offer, defaultGift);
+            return;
+        }
+        // 2) Neckband safety net — management rule: when EW isn't allowed for this cart
+        //    (i.e. default fell through), award any in-stock, category-matching Neckband
+        //    from this offer's config, even if its own slab bounds don't cover this cart.
+        //    Team keeps Neckband quantity topped up so BLNT never fires under normal ops.
+        List<GiftEntity> allGifts = giftRepository.findByOfferId(offer.getId());
+        GiftEntity neckband = allGifts.stream()
+                .filter(g -> g.getName() != null && "neckband".equalsIgnoreCase(g.getName().trim()))
+                .filter(g -> g.getMaxRedemptions() != null && g.getMaxRedemptions() > 0)
+                .filter(g -> itemCategoryIds.stream().anyMatch(catId ->
+                        isItemCategoryEligible(g.getProductCategory(), catId)))
+                .findFirst()
+                .orElse(null);
+        if (neckband != null) {
+            logger.info("Fallback fired for order {} ({}) — default not eligible; awarding Neckband row {} as safety net",
+                    order.getId(), reason, neckband.getId());
+            createScratchOffer(order, offer, neckband);
+            return;
+        }
+        // 3) Absolute last resort — no default, no Neckband available anywhere.
+        logger.warn("Fallback fired for order {} ({}) — no default gift AND no Neckband in stock; awarding Better Luck Next Time",
+                order.getId(), reason);
+        createBetterLuckNextTimeScratch(order, offer);
+    }
     private boolean isItemCategoryEligible(String giftCategories, Integer itemCategoryId) {
         if (giftCategories == null || giftCategories.trim().isEmpty()) {
             return false;
+        }

Subversion Repositories SmartDukaan

(root)//trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/ScratchService.java – Rev 35980 → 37299