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

         Map<Integer, Item> itemMap = this.toItemMap(items);
         Set<Integer> nonSerializedItemIds = new HashSet<>();
         Set<String> serialNumbers = new HashSet<>();
         List<InsuranceModel> insuredModels = new ArrayList<>();
+        noGST = items.stream().anyMatch(item -> "NOGST".equals(item.getHsnCode()));
         for (CustomFofoOrderItem customFofoOrderItem : createOrderRequest.getFofoOrderItems()) {
             Item item = itemMap.get(customFofoOrderItem.getItemId());
-            noGST = item.getHsnCode().equals("NOGST");
             if (item.getType().equals(ItemType.SERIALIZED)) {
                 for (SerialNumberDetail serialNumberDetail : customFofoOrderItem.getSerialNumberDetails()) {
                     serialNumbers.add(serialNumberDetail.getSerialNumber());
                     if (serialNumberDetail.getAmount() > 0) {
                         if (customer.getEmailId() == null || customer.getEmailId().equals("")) {
         Map<Integer, Integer> inventoryItemIdQuantityUsed = new HashMap<>(); // to keep track of inventoryitem quanity
         // used for scan records insertion
         LOGGER.info("itemMap keys {}", itemMap.keySet());
-        // N+1 fix: Fetch live demo serial numbers once before the loop (was being fetched per serialized item)
+        // Fetch live demo serial numbers only for this order's serials (not entire table)
-        Set<String> liveDemoSerialNumbers = new HashSet<>(liveDemoBillingRespository.selectAllSerialNumber());
-        // Batch-fetch LiveDemoSerialNumber entities for all matching serialized inventory serials
-        List<String> matchingLiveDemoSerials = serializedInventoryItemMap.values().stream()
+        List<String> orderSerials = serializedInventoryItemMap.values().stream()
                 .flatMap(Set::stream)
                 .map(InventoryItem::getSerialNumber)
-                .filter(liveDemoSerialNumbers::contains)
                 .collect(Collectors.toList());
         Map<String, LiveDemoSerialNumber> liveDemoSerialNumberMap = new HashMap<>();
-        if (!matchingLiveDemoSerials.isEmpty()) {
+        if (!orderSerials.isEmpty()) {
-            liveDemoSerialNumberMap = liveDemoBillingRespository.selectBySerialNumbers(matchingLiveDemoSerials).stream()
+            liveDemoSerialNumberMap = liveDemoBillingRespository.selectBySerialNumbers(orderSerials).stream()
                     .collect(Collectors.toMap(LiveDemoSerialNumber::getSerialNumber, ld -> ld, (a, b) -> a));
+        }
         // Lets reduce quantity and decide what inventory items to use.
         for (Item item : items) {
+                }
                 inventoryItemsToBill.put(item.getId(), inventoryItemsNonSerializedUsed);
+            }
+        }
-        Map<Integer, PriceModel> itemIdMopPriceMap = pricingService.getPurchasePriceMopPriceNotFound(itemIdCustomFofoOrderItemMap.keySet(), fofoId);
-        LOGGER.info("itemIdMopMap {}", itemIdMopPriceMap);
-        if (accessoriesDeals) {
-            this.validateDpPrice(fofoId, itemIdMopPriceMap, itemIdCustomFofoOrderItemMap);
+        // DP/MOP price validation disabled as of 11 sep 2025 as per tarun sir
-        } else {
-            this.validateMopPrice(fofoId, itemIdMopPriceMap, itemIdCustomFofoOrderItemMap);
-        }
         String fofoStoreCode = this.getFofoStoreCode(fofoId);
         String documentNumber = null;
         if (noGST) {
             documentNumber = this.getSecurityDepositNumber(fofoId, fofoStoreCode);
         return serialNumbers;
+    }
     static final List<String> MOP_VOILATED_BRANDS = Arrays.asList("Live Demo", "Almost New");
+    // DP price validation disabled as of 11 sep 2025 as per tarun sir
     private void validateDpPrice(int fofoId, Map<
             Integer, PriceModel> itemIdMopPriceMap, Map<Integer, CustomFofoOrderItem> itemIdCustomFofoLineItemMap) throws
             ProfitMandiBusinessException {
-        if (pricingService.getMopVoilatedRetailerIds().contains(fofoId)) return;
-        for (Map.Entry<Integer, CustomFofoOrderItem> entry : itemIdCustomFofoLineItemMap.entrySet()) {
-            int itemId = entry.getKey();
-            CustomFofoOrderItem customFofoOrderItem = entry.getValue();
-            LOGGER.info("CustomFofoOrderItem -- {}", customFofoOrderItem);
-            PriceModel priceModel = itemIdMopPriceMap.get(itemId);
-            Item item = itemRepository.selectById(itemId);
-//                Comment this as of now 11 sep 2025 as per tarun sir
-            /*if (!MOP_VOILATED_BRANDS.contains(item.getBrand()) && (item.getCategoryId() == ProfitMandiConstants.MOBILE_CATEGORY_ID || item.getCategoryId() == ProfitMandiConstants.TABLET_CATEGORY_ID || item.getCategoryId() == ProfitMandiConstants.LED_CATEGORY_ID) && customFofoOrderItem.getSerialNumberDetails().stream().filter(x -> org.apache.commons.lang.StringUtils.isNotEmpty(x.getSerialNumber())).collect(Collectors.toList()).size() > 0) {
-                if (Utils.compareFloat(priceModel.getPrice(), customFofoOrderItem.getSellingPrice() + customFofoOrderItem.getDiscountAmount()) > 0) {
-                    throw new ProfitMandiBusinessException("Selling Price for ", item.getItemDescription(), "FFORDR_1010");
-                }
-            } else {
-                if (!MOP_VOILATED_BRANDS.contains(item.getBrand()) && priceModel.getPurchasePrice() > customFofoOrderItem.getSellingPrice()) {
-                    throw new ProfitMandiBusinessException("Selling Price", itemRepository.selectById(itemId).getItemDescription(), "Selling Price should not be less than DP");
-                }
-            }*/
-        }
+    }
+    // MOP price validation disabled as of 11 sep 2025 as per tarun sir
     private void validateMopPrice(int fofoId, Map<
             Integer, PriceModel> itemIdMopPriceMap, Map<Integer, CustomFofoOrderItem> itemIdCustomFofoLineItemMap) throws
             ProfitMandiBusinessException {
-        if (pricingService.getMopVoilatedRetailerIds().contains(fofoId)) return;
-        Map<Integer, Float> invalidMopItemIdPriceMap = new HashMap<>();
-        for (Map.Entry<Integer, PriceModel> entry : itemIdMopPriceMap.entrySet()) {
-            CustomFofoOrderItem customFofoOrderItem = itemIdCustomFofoLineItemMap.get(entry.getKey());
-            Item item = itemRepository.selectById(customFofoOrderItem.getItemId());
-            if (!(MOP_VOILATED_BRANDS.contains(item.getBrand()) || item.getCategoryId() != ProfitMandiConstants.MOBILE_CATEGORY_ID || item.getCategoryId() != ProfitMandiConstants.TABLET_CATEGORY_ID) && customFofoOrderItem.getSellingPrice() + customFofoOrderItem.getDiscountAmount() < entry.getValue().getPrice()) {
-                invalidMopItemIdPriceMap.put(entry.getKey(), customFofoOrderItem.getSellingPrice());
-            }
-        }
-//                Comment this as of now 11 sep 2025 as per tarun sir
-        /*if (!invalidMopItemIdPriceMap.isEmpty()) {
-            LOGGER.error("Invalid itemIds selling prices{} should be greater than mop prices {}", invalidMopItemIdPriceMap, itemIdMopPriceMap);
-            throw new ProfitMandiBusinessException("invalidMopItemIdPrice", invalidMopItemIdPriceMap, "FFORDR_1010");
-        }*/
+    }
     private void updateInventoryItemsAndScanRecord(Set<InventoryItem> inventoryItems, int fofoId, Map<
             Integer, Integer> inventoryItemQuantityUsed, int fofoOrderId) {
         for (InventoryItem inventoryItem : inventoryItems) {

Subversion Repositories SmartDukaan

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