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

     public static final String APP_DOWNLOAD_BILLING_TEMPLATE_ID = "1507163542403945677";
     public static final String APP_DOWNLOAD_BILLING_OFFER = "Dear Customer, Thank you for purchasing from SmartDukaan pls click %s to download our app to see you invoice and special offers. SmartDukaan";
     static Map<Double, List<ScratchedGift>> GIFT_SERIES = new TreeMap<>(Comparator.reverseOrder());
-    private final Map<Integer, LocalDate> partnerNeckbandTracking = new HashMap<>();
     // Define eligible partners for LED & Microwave Oven
-    private static final Set<Integer> PREMIUM_ELIGIBLE_PARTNERS = new HashSet<>(Arrays.asList(175139287, 159690067));
+    private static final Set<Integer> PREMIUM_ELIGIBLE_PARTNERS = new HashSet<>(Arrays.asList(175139615, 175139583));
     private static Map<ScratchedGift, Integer> GIFT_QUANTITIES = new HashMap<>();
-    private final Map<ScratchedGift, LocalDate> premiumGiftTracking = new HashMap<>();
     List<Double> PRICE_RANGE = Arrays.asList(0.0, Double.MAX_VALUE);
     static {
         GIFT_QUANTITIES.put(ScratchedGift.ACCESSORIES_50_PERCENT_OFF, 500);
         GIFT_QUANTITIES.put(ScratchedGift.NECK_BAND, 280);
         GIFT_QUANTITIES.put(ScratchedGift.MICROWAVE_OVEN, 1);
+    }
     static {
         GIFT_SERIES.put(0.0, Arrays.asList(ScratchedGift.ACCESSORIES_50_PERCENT_OFF, ScratchedGift.NECK_BAND));
-        GIFT_SERIES.put(50001.0, Arrays.asList(ScratchedGift.ACCESSORIES_50_PERCENT_OFF, ScratchedGift.NECK_BAND, ScratchedGift.MICROWAVE_OVEN, ScratchedGift.LED));
+        GIFT_SERIES.put(30001.0, Arrays.asList(ScratchedGift.ACCESSORIES_50_PERCENT_OFF, ScratchedGift.NECK_BAND, ScratchedGift.MICROWAVE_OVEN, ScratchedGift.LED));
+    }
     private void persistNonSerializedWithCustomSerialNumber(CustomFofoOrderItem customFofoOrderItem, int orderItemId) {
         // Create a new instance of FofoNonSerializeSerial
         for (String accSerialNumber : customFofoOrderItem.getCustomSerialNumbers()) {
+        }
+    }
     @Override
     public ScratchedGift getSelectedGift(double purchaseAmount, int fofoId) throws ProfitMandiBusinessException {
+        Map<ScratchedGift, Long> scratchOfferCountMap = scratchOfferRepository.countOffersByDateRange(
-        Map<ScratchedGift, Long> scratchOfferCountMap = scratchOfferRepository.countOffersByDateRange(ProfitMandiConstants.SCRATCH_OFFER_START_DATE, ProfitMandiConstants.SCRATCH_OFFER_END_DATE);
+                ProfitMandiConstants.SCRATCH_OFFER_START_DATE, ProfitMandiConstants.SCRATCH_OFFER_END_DATE
+        );
+        LOGGER.info("scratchOfferCountMap {}", scratchOfferCountMap);
+        LocalDateTime startDateTime = ProfitMandiConstants.SCRATCH_OFFER_START_DATE.atStartOfDay();
+        LocalDateTime endDateTime = ProfitMandiConstants.SCRATCH_OFFER_END_DATE.atStartOfDay().plusDays(1);
         RandomCollection<ScratchedGift> giftRandomCollection = createDynamicGiftSeries(scratchOfferCountMap, purchaseAmount, fofoId);
         if (giftRandomCollection.size() > 0) {
             ScratchedGift selectedGift = giftRandomCollection.next();
-            // Restrict Neckband per partner per day
-            if (selectedGift == ScratchedGift.NECK_BAND) {
-                LocalDate lastGivenDate = partnerNeckbandTracking.get(fofoId);
-                if (lastGivenDate != null && lastGivenDate.equals(LocalDate.now())) {
-                    LOGGER.info("Neckband already given today for partner {}", fofoId);
-                    return ScratchedGift.ACCESSORIES_50_PERCENT_OFF;  // Provide an alternate gift
-                }
-                // Update tracking for Neckband distribution
-                partnerNeckbandTracking.put(fofoId, LocalDate.now());
-            }
-            // Restrict LED & Microwave Oven to eligible partners only
+            // 🛑 Ensure one LED for 175139615 and one Oven for 175139583
-            if ((selectedGift == ScratchedGift.LED || selectedGift == ScratchedGift.MICROWAVE_OVEN)) {
+            if (selectedGift == ScratchedGift.LED || selectedGift == ScratchedGift.MICROWAVE_OVEN) {
                 if (!PREMIUM_ELIGIBLE_PARTNERS.contains(fofoId)) {
                     LOGGER.info("Partner {} not eligible for {}", fofoId, selectedGift);
-                    return ScratchedGift.ACCESSORIES_50_PERCENT_OFF; // Give alternate gift
+                    return ScratchedGift.ACCESSORIES_50_PERCENT_OFF; // Default alternate gift
+                }
-                // Ensure only one LED and one Microwave Oven per day
+                // Restrict LED to Partner 175139615 and Oven to Partner 175139583
-                LocalDate lastGivenDate = premiumGiftTracking.get(selectedGift);
+                if ((selectedGift == ScratchedGift.LED && fofoId != 175139615) ||
-                if (lastGivenDate != null && lastGivenDate.equals(LocalDate.now())) {
+                        (selectedGift == ScratchedGift.MICROWAVE_OVEN && fofoId != 175139583)) {
-                    LOGGER.info("{} already given today", selectedGift);
+                    LOGGER.info("Partner {} not eligible for {}", fofoId, selectedGift);
                     return ScratchedGift.ACCESSORIES_50_PERCENT_OFF;
+                }
-                // Mark the gift as given today
+                // Ensure only one LED and one Microwave Oven per day
+                long ledCount = scratchOfferCountMap.getOrDefault(ScratchedGift.LED, 0L);
+                long ovenCount = scratchOfferCountMap.getOrDefault(ScratchedGift.MICROWAVE_OVEN, 0L);
-                premiumGiftTracking.put(selectedGift, LocalDate.now());
+                if ((selectedGift == ScratchedGift.LED || selectedGift == ScratchedGift.MICROWAVE_OVEN)
+                        && (ledCount > 0 && ovenCount > 0)) {
+                    LOGGER.info("Both LED and Microwave Oven already given today.");
+                    return ScratchedGift.ACCESSORIES_50_PERCENT_OFF;
+                }
+            }
-            // Restrict LED & Microwave Oven to eligible partners only
+            // 🛑 Ensure only one Neckband per partner per day
-            if ((selectedGift == ScratchedGift.LED || selectedGift == ScratchedGift.MICROWAVE_OVEN)) {
+            if (selectedGift == ScratchedGift.NECK_BAND) {
-                if (!PREMIUM_ELIGIBLE_PARTNERS.contains(fofoId)) {
+                List<FofoOrder> fofoOrders = fofoOrderRepository.selectByFofoId(fofoId, startDateTime, endDateTime, 0, 0);
-                    LOGGER.info("Partner {} not eligible for {}", fofoId, selectedGift);
+                List<String> invoiceNumbers = fofoOrders.stream().map(FofoOrder::getInvoiceNumber).collect(Collectors.toList());
-                    return ScratchedGift.ACCESSORIES_50_PERCENT_OFF; // Give alternate gift
+                List<ScratchOffer> offers = scratchOfferRepository.selectByInvoiceNumbers(invoiceNumbers);
-                }
+                LOGGER.info("offers for partner {}", offers);
-                // Ensure only one LED and one Microwave Oven per day
-                LocalDate lastGivenDate = premiumGiftTracking.get(selectedGift);
+                boolean neckbandGivenToday = offers.stream().anyMatch(offer -> offer.getOfferName() == ScratchedGift.NECK_BAND);
-                if (lastGivenDate != null && lastGivenDate.equals(LocalDate.now())) {
+                if (neckbandGivenToday) {
-                    LOGGER.info("{} already given today", selectedGift);
+                    LOGGER.info("Neckband already given today for partner {}", fofoId);
                     return ScratchedGift.ACCESSORIES_50_PERCENT_OFF;
+                }
-                // Mark the gift as given today
-                premiumGiftTracking.put(selectedGift, LocalDate.now());
+            }
             return selectedGift;
-        } else {
-            return ScratchedGift.ACCESSORIES_50_PERCENT_OFF;
+        }
+        return ScratchedGift.ACCESSORIES_50_PERCENT_OFF;
+    }
-    public RandomCollection<ScratchedGift> createDynamicGiftSeries(Map<ScratchedGift, Long> soldGiftCountMap,
-                                                                   Double sellingPrice, int fofoId)
-            throws ProfitMandiBusinessException {
+    public RandomCollection<ScratchedGift> createDynamicGiftSeries(Map<ScratchedGift, Long> soldGiftContMap, Double sellingPrice, int fofoId) throws ProfitMandiBusinessException {
         int index = 0;
         RandomCollection<ScratchedGift> randomCollection = new RandomCollection<>();
         PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoId, LocalDate.now());
         LOGGER.info("partnerType {}", partnerType);
             sellingPrice = 0.0;
+        }
         for (int i = 0; i < PRICE_RANGE.size(); i++) {
             Double price = PRICE_RANGE.get(i);
+            Double nextPrice = Double.MAX_VALUE;
+            if (i != PRICE_RANGE.size() - 1) {
-            Double nextPrice = (i != PRICE_RANGE.size() - 1) ? PRICE_RANGE.get(i + 1) : Double.MAX_VALUE;
+                nextPrice = PRICE_RANGE.get(i + 1);
+            }
             if (sellingPrice >= price && sellingPrice < nextPrice) {
                 int divisor = PRICE_RANGE.size() - index;
                 LOGGER.info("Processing price range: {}, sellingPrice: {}", price, sellingPrice);
                 for (ScratchedGift gift : GIFT_SERIES.get(price)) {
-                    int remainingQty = GIFT_QUANTITIES.get(gift) - soldGiftCountMap.getOrDefault(gift, 0L).intValue();
+                    int remainingQty = GIFT_QUANTITIES.get(gift) - soldGiftContMap.getOrDefault(gift, 0L).intValue();
                     LOGGER.info("Checking gift: {}, remainingQty: {}", gift, remainingQty);
                     if (remainingQty > 0) {
                         int weight = (remainingQty > divisor) ? remainingQty / divisor : remainingQty;
-                        if (gift == ScratchedGift.NECK_BAND) {
-                            LocalDate lastGivenDate = partnerNeckbandTracking.get(fofoId);
-                            if (lastGivenDate == null || !lastGivenDate.equals(LocalDate.now())) {
-                                randomCollection.add(weight, gift);
+                        randomCollection.add(weight, gift);
-                            }
-                        } else if (gift == ScratchedGift.LED || gift == ScratchedGift.MICROWAVE_OVEN) {
-                            if (PREMIUM_ELIGIBLE_PARTNERS.contains(fofoId) && !premiumGiftTracking.containsKey(gift)) {
-                                randomCollection.add(weight, gift);
-                            }
-                        } else {
-                            randomCollection.add(weight, gift);
+                        LOGGER.info("Added gift: {}, weight: {}", gift, weight);
-                        }
+                    }
+                }
-                break;
+                break; // Exit the loop once the correct price range is processed
+            }
             index++;
+        }
+        // If no gifts were added, log and handle potential issues here
         if (randomCollection.size() == 0) {
             LOGGER.info("No gifts added for sellingPrice: {} in createDynamicGiftSeries", sellingPrice);
+        }
+        LOGGER.info("randomCollectionSize {}, partnerType {}, sellingPrice {}", randomCollection.size(), partnerType, sellingPrice);
         return randomCollection;
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java – Rev 34342 → 34351