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

         Map<Integer, CustomFofoOrderItem> itemIdCustomFofoOrderItemMap = new HashMap<>();
         Map<Integer, Float> lineItemPrice = new HashMap<>(); // this is for pricing error
         float totalAmount = 0;
         boolean noGST = false;
-        int changedTotalBillAmount = 0;
-        for (CustomPaymentOption cpo : createOrderRequest.getPaymentOptions()) {
-            changedTotalBillAmount += cpo.getAmount();
-        }
         // N+1 fix: Batch fetch all PendingOrderItems before the validation loop
         List<Integer> validationPoiIds = createOrderRequest.getFofoOrderItems().stream()
                 .map(CustomFofoOrderItem::getPoiId)
                 .filter(id -> id > 0)
+        }
         // Lets reduce quantity and decide what inventory items to use.
         for (Item item : items) {
             if (item.getType().equals(ItemType.SERIALIZED)) {
+                Set<InventoryItem> inventoryItemsSerializedserialized = serializedInventoryItemMap.get(item.getId());
+                if (inventoryItemsSerializedserialized == null) {
+                    List<String> invalidSerialNumbers = itemIdCustomFofoOrderItemMap.get(item.getId()).getSerialNumberDetails().stream().map(x -> x.getSerialNumber()).collect(Collectors.toList());
+                    throw new ProfitMandiBusinessException("invalidSerialNumbers", invalidSerialNumbers, "FFORDR_1004");
-                // TODO:handle null
+                }
-                if (serializedInventoryItemMap.get(item.getId()) == null || itemIdCustomFofoOrderItemMap.get(item.getId()).getSerialNumberDetails().size() != serializedInventoryItemMap.get(item.getId()).size()) {
+                if (itemIdCustomFofoOrderItemMap.get(item.getId()).getSerialNumberDetails().size() != inventoryItemsSerializedserialized.size()) {
                     LOGGER.info("InsuredModels: {}, and Serialized: {}", insuredModels.size(), itemIdCustomFofoOrderItemMap.get(item.getId()).getSerialNumberDetails().size());
                     if (itemIdCustomFofoOrderItemMap.get(item.getId()).getSerialNumberDetails().size() != insuredModels.size()) {
                         List<String> invalidSerialNumbers = itemIdCustomFofoOrderItemMap.get(item.getId()).getSerialNumberDetails().stream().map(x -> x.getSerialNumber()).collect(Collectors.toList());
                         throw new ProfitMandiBusinessException("invalidSerialNumbers", invalidSerialNumbers, "FFORDR_1004");
+                    }
+                }
-                Set<InventoryItem> inventoryItemsSerializedserialized = serializedInventoryItemMap.get(item.getId());
                 for (InventoryItem inventoryItem : inventoryItemsSerializedserialized) {
                     inventoryItem.setGoodQuantity(0);
                     inventoryItemIdQuantityUsed.put(inventoryItem.getId(), 1);
                     LiveDemoSerialNumber liveDemoSerialNumber = liveDemoSerialNumberMap.get(inventoryItem.getSerialNumber());
                     if (liveDemoSerialNumber != null) {
         if (customerAddress == null || customerAddress.getState() == null || customerAddress.getState().equals(retailerAddress.getState())) {
             try {
                 State state = stateRepository.selectByName(retailerAddress.getState());
                 stateId = Long.valueOf(state.getId()).intValue();
             } catch (Exception e) {
-                LOGGER.error("Unable to get state rates");
+                LOGGER.error("Unable to get state rates for state: {}", retailerAddress.getState(), e);
+            }
+        }
         // N+1 fix: Pre-fetch tagListings and GST rates before the loop
         Map<Integer, TagListing> tagListingMap = tagListingRepository.selectByItemIds(itemIdCustomFofoOrderItemMap.keySet());
+                }
+            }
             po.setStatus(OrderStatus.BILLED);
+        }
+        //Process scratch (only if smartphone in order — processScratchOffer re-queries items)
-        //Process scratch
+        if (smartPhone) {
-        this.processScratchOffer(fofoOrder);
+            this.processScratchOffer(fofoOrder);
+        }
 //        persist the data of upgrade offer table
         for (CustomFofoOrderItem customFofoOrderItem : createOrderRequest.getFofoOrderItems()) {
             if (customFofoOrderItem.getCustomerOfferItemId().size() > 0) {
                 for (Integer customerOfferItemId : customFofoOrderItem.getCustomerOfferItemId()) {
             if (LocalDateTime.now().isAfter(startDate.atStartOfDay()) && LocalDateTime.now().isBefore(endDate.atTime(Utils.MAX_TIME))) {
                 Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
                 try {
                     this.sendAppDownloadBillingOffer(customer.getMobileNumber());
                 } catch (Exception e) {
-                    // TODO Auto-generated catch block
+                    LOGGER.error("Failed to send app download billing offer for customer {}", customer.getMobileNumber(), e);
-                    e.printStackTrace();
+                }
                 if (specificPriceOffer) {
                     this.createSpecificPriceScratchOffer(fofoOrder.getInvoiceNumber(), fofoOrder.getCustomerId(), fofoOrder.getFofoId(), maxPurchaseValue);
                 } else if (randomOffer) {
                     this.createRandomScratchOffer(fofoOrder.getInvoiceNumber(), fofoOrder.getCustomerId());
+        }
         fofoOrderItem.setDiscount(customFofoOrderItem.getDiscountAmount());
         Item item = itemMap.get(customFofoOrderItem.getItemId());
-        // N+1 fix: Use pre-fetched gstRateMap instead of querying per item
+        // Use first inventory item to get HSN code and GST rates
-        for (InventoryItem inventoryItem : inventoryItems) {
+        InventoryItem firstInventoryItem = inventoryItems.iterator().next();
-            GstRate gstRate = gstRateMap.get(inventoryItem.getItemId());
+        GstRate gstRate = gstRateMap.get(firstInventoryItem.getItemId());
-            if (gstRate != null) {
+        if (gstRate != null) {
-                fofoOrderItem.setIgstRate(gstRate.getIgstRate());
+            fofoOrderItem.setIgstRate(gstRate.getIgstRate());
-                fofoOrderItem.setCgstRate(gstRate.getCgstRate());
+            fofoOrderItem.setCgstRate(gstRate.getCgstRate());
-                fofoOrderItem.setSgstRate(gstRate.getSgstRate());
+            fofoOrderItem.setSgstRate(gstRate.getSgstRate());
-            }
-            fofoOrderItem.setHsnCode(inventoryItem.getHsnCode());
-            break;
+        }
+        fofoOrderItem.setHsnCode(firstInventoryItem.getHsnCode());
         fofoOrderItem.setBrand(item.getBrand());
         fofoOrderItem.setModelName(item.getModelName());
         fofoOrderItem.setModelNumber(item.getModelNumber());
         fofoOrderItem.setColor(item.getColor());
         fofoOrderItemRepository.persist(fofoOrderItem);

Subversion Repositories SmartDukaan

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