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";
+    List<Double> PRICE_RANGE = Arrays.asList(0.0, 12001.0, 35001.0, Double.MAX_VALUE);
+    static Map<Double, List<ScratchedGift>> GIFT_SERIES = new TreeMap<>(Comparator.reverseOrder());
+    private void persistNonSerializedWithCustomSerialNumber(CustomFofoOrderItem customFofoOrderItem, int orderItemId) {
+        // Create a new instance of FofoNonSerializeSerial
+        for (String accSerialNumber : customFofoOrderItem.getCustomSerialNumbers()) {
+            if (!accSerialNumber.isEmpty()) {
+                FofoNonSerializeSerial nonSerializeSerial = new FofoNonSerializeSerial();
+                // Populate the entity with relevant information
+                nonSerializeSerial.setOrderItemId(orderItemId);
+                nonSerializeSerial.setSerialNumber(accSerialNumber);
+                // Save the entity to the database
+                fofoNonSerializeSerialRepository.persist(nonSerializeSerial);
+            }
+        }
+    }
+    public void sendAppDownloadBillingOffer(String mobileNumber) throws Exception {
+        String sdurl = "http://surl.li/anhfn";
+        try {
+            if (prodEnv) {
+                this.sendSms(APP_DOWNLOAD_BILLING_TEMPLATE_ID, String.format(APP_DOWNLOAD_BILLING_OFFER, sdurl), mobileNumber);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    public void sendSms(String dltTemplateId, String message, String mobileNumber) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("sender", SENDER);
+        map.put("messagetype", "TXT");
+        map.put("apikey", "b866f7-c6c483-682ff5-054420-ad9e2c");
+        map.put("numbers", "91" + mobileNumber);
+        LOGGER.info("Message {}", message);
+        // OTP Message Template
+        map.put("message", message);
+        map.put("dlttempid", dltTemplateId);
+        String response = restClient.post(SMS_GATEWAY, map, new HashMap<>());
+        LOGGER.info(response);
+    }
+    private void createScratchOffer(int fofoId, String invoiceNumber, int customerId) {
+        //ScratchedGift gift = getScratchedGiftRandom(fofoId, customerId);
+        //  LocalDateTime endDate = LocalDateTime.of(LocalDate.now().getYear(), LocalDate.now().getMonth(), 27, 21, 00);
+        List<ScratchOffer> scratchOffers = scratchOfferRepository.selectBycCustomerIdAndDate(customerId, ProfitMandiConstants.SCRATCH_OFFER_START_DATE, ProfitMandiConstants.SCRATCH_OFFER_END_DATE);
+        if (scratchOffers.size() == 0) {
+            ScratchOffer so2 = new ScratchOffer();
+            so2.setInvoiceNumber(invoiceNumber);
+            so2.setScratched(false);
+            so2.setCreatedTimestamp(LocalDateTime.now());
+            so2.setExpiredTimestamp(ProfitMandiConstants.SCRATCH_OFFER_END_DATE.plusDays(1).atTime(LocalTime.MAX));
+            so2.setOfferName(ScratchedGift.BLNT);
+            so2.setCustomerId(customerId);
+            LocalDateTime today830PM = LocalDate.now().atTime(20, 30);
+            LocalDateTime today9PM = LocalDate.now().atTime(21, 0);
+            so2.setUnlockedAt(LocalDateTime.now());
+//            if (LocalDateTime.now().isAfter(today830PM)) {
+//                so2.setUnlockedAt(today9PM.plusDays(0));
+//            } else {
+//                so2.setUnlockedAt(today9PM);
+//            }
+            scratchOfferRepository.persist(so2);
+        }
+    }
+    private static Map<ScratchedGift, Integer> GIFT_QUANTITIES = new HashMap<>();
+    static {
+        GIFT_QUANTITIES.put(ScratchedGift.CASSROLE, 120);
+        GIFT_QUANTITIES.put(ScratchedGift.NECK_BAND, 920);
+        GIFT_QUANTITIES.put(ScratchedGift.JUICE_JUG, 160);
+        GIFT_QUANTITIES.put(ScratchedGift.INSULATED_FLASK, 140);
+        GIFT_QUANTITIES.put(ScratchedGift.ACCESSORIES_50_PERCENT_OFF, 1000);
+        GIFT_QUANTITIES.put(ScratchedGift.EW, 3000);
+    }
+    static {
+        GIFT_SERIES.put(0.0, Arrays.asList(ScratchedGift.ACCESSORIES_50_PERCENT_OFF, ScratchedGift.EW));
+        GIFT_SERIES.put(12001.0, Arrays.asList(ScratchedGift.CASSROLE, ScratchedGift.NECK_BAND, ScratchedGift.JUICE_JUG, ScratchedGift.INSULATED_FLASK));
+        GIFT_SERIES.put(35001.0, Arrays.asList(ScratchedGift.CASSROLE, ScratchedGift.NECK_BAND, ScratchedGift.JUICE_JUG, ScratchedGift.INSULATED_FLASK));
+    }
     @Override
     public int createOrder(CreateOrderRequest createOrderRequest, int fofoId, boolean accessoriesDeals) throws ProfitMandiBusinessException {
         LOGGER.info("fofoId -- {} Order Request -- {}", fofoId, createOrderRequest);
         CustomCustomer customCustomer = createOrderRequest.getCustomer();
         Customer customer = customerRepository.selectById(customCustomer.getCustomerId());
+                }
+            }
+        }
         // Update Partner Opening Stock current qty
-        if (fofoOrder.getId() > 0){
+        if (fofoOrder.getId() > 0) {
             List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
             for (FofoOrderItem fofoOrderItem : fofoOrderItems) {
                 Item item = itemRepository.selectById(fofoOrderItem.getItemId());
-                smartCartService.minusOpeningStock(item.getId(),fofoOrder.getFofoId(),fofoOrderItem.getQuantity());
+                smartCartService.minusOpeningStock(item.getId(), fofoOrder.getFofoId(), fofoOrderItem.getQuantity());
+            }
+        }
         return fofoOrder.getId();
+    }
-    static Map<Double, List<ScratchedGift>> GIFT_SERIES = new TreeMap<>(Comparator.reverseOrder());
-    private void persistNonSerializedWithCustomSerialNumber(CustomFofoOrderItem customFofoOrderItem, int orderItemId) {
-        // Create a new instance of FofoNonSerializeSerial
-        for (String accSerialNumber : customFofoOrderItem.getCustomSerialNumbers()) {
-            if (!accSerialNumber.isEmpty()) {
-                FofoNonSerializeSerial nonSerializeSerial = new FofoNonSerializeSerial();
-                // Populate the entity with relevant information
-                nonSerializeSerial.setOrderItemId(orderItemId);
-                nonSerializeSerial.setSerialNumber(accSerialNumber);
-                // Save the entity to the database
-                fofoNonSerializeSerialRepository.persist(nonSerializeSerial);
-            }
-        }
-    }
-    public void sendAppDownloadBillingOffer(String mobileNumber) throws Exception {
-        String sdurl = "http://surl.li/anhfn";
-        try {
-            if (prodEnv) {
-                this.sendSms(APP_DOWNLOAD_BILLING_TEMPLATE_ID, String.format(APP_DOWNLOAD_BILLING_OFFER, sdurl), mobileNumber);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    public void sendSms(String dltTemplateId, String message, String mobileNumber) throws Exception {
-        Map<String, String> map = new HashMap<>();
-        map.put("sender", SENDER);
-        map.put("messagetype", "TXT");
-        map.put("apikey", "b866f7-c6c483-682ff5-054420-ad9e2c");
-        map.put("numbers", "91" + mobileNumber);
-        LOGGER.info("Message {}", message);
-        // OTP Message Template
-        map.put("message", message);
-        map.put("dlttempid", dltTemplateId);
-        String response = restClient.post(SMS_GATEWAY, map, new HashMap<>());
-        LOGGER.info(response);
-    }
-    private void createScratchOffer(int fofoId, String invoiceNumber, int customerId) {
-        //ScratchedGift gift = getScratchedGiftRandom(fofoId, customerId);
-        //  LocalDateTime endDate = LocalDateTime.of(LocalDate.now().getYear(), LocalDate.now().getMonth(), 27, 21, 00);
-        List<ScratchOffer> scratchOffers = scratchOfferRepository.selectBycCustomerIdAndDate(customerId, ProfitMandiConstants.SCRATCH_OFFER_START_DATE, ProfitMandiConstants.SCRATCH_OFFER_END_DATE);
-        if (scratchOffers.size() == 0) {
-            ScratchOffer so2 = new ScratchOffer();
-            so2.setInvoiceNumber(invoiceNumber);
-            so2.setScratched(false);
-            so2.setCreatedTimestamp(LocalDateTime.now());
-            so2.setExpiredTimestamp(ProfitMandiConstants.SCRATCH_OFFER_END_DATE.plusDays(1).atTime(LocalTime.MAX));
-            so2.setOfferName(ScratchedGift.BLNT);
-            so2.setCustomerId(customerId);
-            LocalDateTime today830PM = LocalDate.now().atTime(20, 30);
-            LocalDateTime today9PM = LocalDate.now().atTime(21, 0);
-            so2.setUnlockedAt(LocalDateTime.now());
-//            if (LocalDateTime.now().isAfter(today830PM)) {
-//                so2.setUnlockedAt(today9PM.plusDays(0));
-//            } else {
-//                so2.setUnlockedAt(today9PM);
-//            }
-            scratchOfferRepository.persist(so2);
-        }
-    }
-    private static Map<ScratchedGift, Integer> GIFT_QUANTITIES = new HashMap<>();
-    static {
-        GIFT_QUANTITIES.put(ScratchedGift.CASSROLE, 120);
-        GIFT_QUANTITIES.put(ScratchedGift.NECK_BAND, 920);
-        GIFT_QUANTITIES.put(ScratchedGift.JUICE_JUG, 160);
-        GIFT_QUANTITIES.put(ScratchedGift.INSULATED_FLASK, 140);
-        GIFT_QUANTITIES.put(ScratchedGift.ACCESSORIES_50_PERCENT_OFF, 1000);
-        GIFT_QUANTITIES.put(ScratchedGift.EW, 3000);
-    }
-    static {
-        GIFT_SERIES.put(0.0, Arrays.asList(ScratchedGift.ACCESSORIES_50_PERCENT_OFF, ScratchedGift.EW));
-        GIFT_SERIES.put(12001.0, Arrays.asList(ScratchedGift.CASSROLE, ScratchedGift.NECK_BAND, ScratchedGift.JUICE_JUG, ScratchedGift.INSULATED_FLASK));
-        GIFT_SERIES.put(35001.0, Arrays.asList(ScratchedGift.CASSROLE, ScratchedGift.NECK_BAND, ScratchedGift.JUICE_JUG, ScratchedGift.INSULATED_FLASK));
-    }
-    List<Double> PRICE_RANGE = Arrays.asList(0.0, 12001.0,35001.0);
     @Override
     public void processScratchOffer(FofoOrder fofoOrder) throws ProfitMandiBusinessException {
         boolean isSmartPhonePurchased = false;
         float maxPurchaseValue = 0;
         List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
                 } catch (Exception e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
+                }
                 if (specificPriceOffer) {
-                    this.createSpecificPriceScratchOffer(fofoOrder.getInvoiceNumber(), fofoOrder.getCustomerId(),fofoOrder.getFofoId(), maxPurchaseValue);
+                    this.createSpecificPriceScratchOffer(fofoOrder.getInvoiceNumber(), fofoOrder.getCustomerId(), fofoOrder.getFofoId(), maxPurchaseValue);
                 } else if (randomOffer) {
                     this.createRandomScratchOffer(fofoOrder.getInvoiceNumber(), fofoOrder.getCustomerId());
                     LOGGER.info("randomOffer {}", randomOffer);
                 } else {
                     this.createScratchOffer(fofoOrder.getFofoId(), fofoOrder.getInvoiceNumber(), fofoOrder.getCustomerId());
+            }
+        }
+    }
     @Override
-    public ScratchedGift getSelectedGift(double purchaseAmount,int fofoId) throws ProfitMandiBusinessException {
+    public ScratchedGift getSelectedGift(double purchaseAmount, int fofoId) throws ProfitMandiBusinessException {
         //Iterating map in reverse order of values
         Map<ScratchedGift, Long> scratchOfferCountMap = scratchOfferRepository.countOffersByDateRange(ProfitMandiConstants.SCRATCH_OFFER_START_DATE, ProfitMandiConstants.SCRATCH_OFFER_END_DATE);
-        RandomCollection<ScratchedGift> giftRandomCollection = createDynamicGiftSeries(scratchOfferCountMap, purchaseAmount,fofoId);
+        RandomCollection<ScratchedGift> giftRandomCollection = createDynamicGiftSeries(scratchOfferCountMap, purchaseAmount, fofoId);
         if (giftRandomCollection.size() > 0) {
             return giftRandomCollection.next();
         } else if (purchaseAmount < 35000) {
             // Default gift if no match found
             return ScratchedGift.EW;
+    }
     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());
+        PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoId, LocalDate.now());
-        LOGGER.info("partnerType {}",partnerType);
+        LOGGER.info("partnerType {}", partnerType);
         if (partnerType.equals(PartnerType.BRONZE)) {
-            LOGGER.info("partnerType if- {}",partnerType);
+            LOGGER.info("partnerType if- {}", partnerType);
             sellingPrice = 0.0;
+        }
+        for (int i = 0; i < PRICE_RANGE.size(); i++) {
-        for (Double price : PRICE_RANGE) {
+            Double price = PRICE_RANGE.get(i);
+            Double nextPrice = Double.MAX_VALUE;
-            if (sellingPrice >= price) {
+            if (i != PRICE_RANGE.size() - 1) {
+                nextPrice = PRICE_RANGE.get(i + 1);
+            }
-                // If we find a matching price range, add gifts and exit the loop
+            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) - soldGiftContMap.getOrDefault(gift, 0L).intValue();
+                    LOGGER.info("Checking gift: {}, remainingQty: {}", gift, remainingQty);
                     if (remainingQty > 0) {
                         int weight = (remainingQty > divisor) ? remainingQty / divisor : remainingQty;
                         randomCollection.add(weight, gift);
+                        LOGGER.info("Added gift: {}, weight: {}", gift, weight);
+                    }
+                }
-                break; // Exit loop once matching price range is processed
+                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 {}, price {},", randomCollection.size(), partnerType, sellingPrice);
+        LOGGER.info("randomCollectionSize {}, partnerType {}, sellingPrice {}", randomCollection.size(), partnerType, sellingPrice);
         return randomCollection;
+    }
     /*static {
         RandomCollection<ScratchedGift> map1 = new RandomCollection<ScratchedGift>().
                 add(100d, ScratchedGift.GIFT_BOWL);
         GIFT_SERIES.put(0.0, map1);
         //Map<ScratchedGift, Double> map2 = new HashMap<>();
         GIFT_SERIES.put(50001.0, map5);
     }*/
     private void createSpecificPriceScratchOffer(String invoiceNumber, int customerId, int fofoId, float purchaseAmount) throws ProfitMandiBusinessException {
-        ScratchedGift selectedGift = getSelectedGift(purchaseAmount,fofoId);
+        ScratchedGift selectedGift = getSelectedGift(purchaseAmount, fofoId);
         List<ScratchOffer> scratchOffers = scratchOfferRepository.selectBycCustomerIdAndDate(customerId, ProfitMandiConstants.SCRATCH_OFFER_START_DATE, ProfitMandiConstants.SCRATCH_OFFER_END_DATE);
         if (scratchOffers.size() == 0) {
             ScratchOffer so2 = new ScratchOffer();
             so2.setInvoiceNumber(invoiceNumber);
             so2.setScratched(false);

Subversion Repositories SmartDukaan

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