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

+                }
                 map.put("brands", brands);
                 map.put("retailerBlockBrands", retailerBlockBrands);
                 try {
-                    PrivateDealUser privateDealUser = privateDealUserRepository.selectById(retailer.getId());
-                    if (privateDealUser.getCounterId() != null) {
-                        Counter counter = counterRepository.selectById(privateDealUser.getCounterId());
+                    FofoStore gstStore = fofoStoreRepository.selectByRetailerId(retailer.getId());
-                        map.put("gstNumber", counter.getGstin());
+                    map.put("gstNumber", gstStore != null ? gstStore.getGstNumber() : null);
-                        // LOGGER.info("gstNumber" + counter.getGstin());
-                    }
-                } catch (ProfitMandiBusinessException profitMandiBusinessException) {
+                } catch (ProfitMandiBusinessException e) {
-                    LOGGER.error("PrivateDealUser not found");
+                    LOGGER.error("FofoStore not found for GST lookup");
+                }
                 try {
                     int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(retailer.getId());
                     Address retailerAddress = addressRepository.selectById(retailerAddressId);
                     map.put("retailerAddress", retailerAddress);
             fofoStore.setAstId(updateRetailerRequest.getAstId());
             fofoStore.setMinimumInvestment(updateRetailerRequest.getMinInvestment());
             fofoStore.setWarehouseId(updateRetailerRequest.getWarehouseId());
             fofoStore.setCounterPotential(updateRetailerRequest.getCounterPotential());
             fofoStore.setFofoType(updateRetailerRequest.getFofoType());
+            fofoStore.setGstNumber(updateRetailerRequest.getGstNumber());
         } else {
             int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(retailerId);
             Address retailerAddress = addressRepository.selectById(retailerAddressId);
             // StateInfo stateInfo = null;
                 fofoStore.setInternal(false);
+            }
             fofoStore.setFofoType(FofoType.FRANCHISE);
             fofoStore.setFofoType(updateRetailerRequest.getFofoType());
             fofoStore.setActivationType(ActivationType.ACTIVE);
+            fofoStore.setGstNumber(updateRetailerRequest.getGstNumber());
             fofoStoreRepository.persist(fofoStore);
             // Auto fill in onboarding Panel
             PartnerOnBoardingPanel pobp = partnerOnBoardingPanelRepository.selectByPhoneNumber(Long.parseLong(retailerAddress.getPhoneNumber()));
             if (pobp != null) {
         // Batch fetch all FofoStores to avoid N+1 queries
         Set<Integer> retailerIds = addresses.stream().map(Address::getRetaierId).collect(Collectors.toSet());
         Map<Integer, FofoStore> fofoStoreMap = fofoStoreRepository.selectByRetailerIds(new ArrayList<>(retailerIds))
                 .stream().collect(Collectors.toMap(FofoStore::getId, fs -> fs));
-        // Batch fetch all PrivateDealUsers to avoid N+1 queries
-        Map<Integer, PrivateDealUser> privateDealUserMap = privateDealUserRepository.selectByIds(new ArrayList<>(retailerIds))
-                .stream().collect(Collectors.toMap(PrivateDealUser::getId, pdu -> pdu));
-        // Batch fetch all Counters to avoid N+1 queries
-        Set<Integer> counterIds = privateDealUserMap.values().stream()
-                .filter(pdu -> pdu.getCounterId() != null)
-                .map(PrivateDealUser::getCounterId)
-                .collect(Collectors.toSet());
-        Map<Integer, Counter> counterMap = counterIds.isEmpty() ? Collections.emptyMap()
-                : counterRepository.selectByIds(new ArrayList<>(counterIds))
-                .stream().collect(Collectors.toMap(Counter::getId, c -> c));
         Map<Integer, CustomRetailer> customRetailersMap = new HashMap<>();
         for (Address address : addresses) {
             com.spice.profitmandi.dao.entity.user.User user = userAddressMap.get(address.getId());
             FofoStore fs = fofoStoreMap.get(address.getRetaierId());
             if (fs == null) {
                 continue;
+            }
-            CustomRetailer customRetailer = buildCustomRetailer(user, address, fs, privateDealUserMap, counterMap);
+            CustomRetailer customRetailer = buildCustomRetailer(user, address, fs);
             customRetailersMap.put(customRetailer.getPartnerId(), customRetailer);
+        }
         return customRetailersMap;
+    }
     /**
      * Helper method to build CustomRetailer from fetched entities
      */
     private CustomRetailer buildCustomRetailer(com.spice.profitmandi.dao.entity.user.User user, Address address,
-                                               FofoStore fs, Map<Integer, PrivateDealUser> privateDealUserMap,
-                                               Map<Integer, Counter> counterMap) {
+                                               FofoStore fs) {
         CustomRetailer customRetailer = new CustomRetailer();
         customRetailer.setEmail(user.getEmailId());
         customRetailer.setBusinessName(address.getName());
         customRetailer.setMobileNumber(address.getPhoneNumber());
         customRetailer.setCode(fs.getCode());
         customRetailer.setWarehouseId(fs.getWarehouseId());
         customRetailer.setPartnerId(fs.getId());
         customRetailer.setFofoType(fs.getFofoType());
         customRetailer.setCartId(user.getActiveCartId());
-        // Get GST number from pre-fetched maps
-        PrivateDealUser pdu = privateDealUserMap.get(address.getRetaierId());
-        if (pdu != null && pdu.getCounterId() != null) {
-            Counter counter = counterMap.get(pdu.getCounterId());
-            customRetailer.setGstNumber(counter != null ? counter.getGstin() : null);
+        customRetailer.setGstNumber(fs.getGstNumber());
-        }
         CustomAddress customAddress = buildCustomAddress(address);
         customRetailer.setAddress(customAddress);
         customRetailer.setDisplayName(customRetailer.getBusinessName() + "-" + customRetailer.getCode() + "- " + customAddress.getCity());
         return customRetailer;
         customRetailer.setCode(store.getCode());
         customRetailer.setAstId(store.getAstId());
         customRetailer.setActivationType(store.getActivationType());
         customRetailer.setWarehouseId(store.getWarehouseId());
-        // Get GST number
-        try {
-            PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
-            if (pdu != null && pdu.getCounterId() != null) {
-                Counter counter = counterRepository.selectById(pdu.getCounterId());
-                customRetailer.setGstNumber(counter != null ? counter.getGstin() : null);
-            }
-        } catch (Exception e) {
-            customRetailer.setGstNumber(null);
+        customRetailer.setGstNumber(store.getGstNumber());
-        }
         // Reuse helper method for CustomAddress
         CustomAddress customAddress = buildCustomAddress(address);
         customRetailer.setAddress(customAddress);
         customRetailer.setDisplayName(address.getName() + " - " + address.getCity());
         // Batch fetch all retailerIds to userIds mapping to avoid N+1
         Set<Integer> retailerIds = addresses.stream().map(Address::getRetaierId).collect(Collectors.toSet());
         Map<Integer, Integer> retailerIdToUserIdMap = getUserIdRetailerIdMapReverse(retailerIds);
-        // Batch fetch all PrivateDealUsers to avoid N+1 queries
+        // Batch fetch FofoStores for GST numbers
-        Map<Integer, PrivateDealUser> privateDealUserMap = privateDealUserRepository.selectByIds(new ArrayList<>(retailerIds))
+        Map<Integer, FofoStore> fofoStoreMap = fofoStoreRepository.selectByRetailerIds(new ArrayList<>(retailerIds))
-                .stream().collect(Collectors.toMap(PrivateDealUser::getId, pdu -> pdu));
-        // Batch fetch all Counters to avoid N+1 queries
-        Set<Integer> counterIds = privateDealUserMap.values().stream()
-                .filter(pdu -> pdu.getCounterId() != null)
-                .map(PrivateDealUser::getCounterId)
-                .collect(Collectors.toSet());
-        Map<Integer, Counter> counterMap = counterIds.isEmpty() ? Collections.emptyMap()
-                : counterRepository.selectByIds(new ArrayList<>(counterIds))
-                .stream().collect(Collectors.toMap(Counter::getId, c -> c));
+                .stream().collect(Collectors.toMap(FofoStore::getId, fs -> fs));
         Map<Integer, CustomRetailer> customRetailersMap = new HashMap<>();
         for (Address address : addresses) {
             com.spice.profitmandi.dao.entity.user.User user = userAddressMap.get(address.getId());
             Integer userId = retailerIdToUserIdMap.get(user.getId());
             customRetailer.setBusinessName(address.getName());
             customRetailer.setMobileNumber(address.getPhoneNumber());
             customRetailer.setCartId(user.getActiveCartId());
             customRetailer.setPartnerId(address.getRetaierId());
-            // Get GST number from pre-fetched maps
-            PrivateDealUser pdu = privateDealUserMap.get(address.getRetaierId());
+            FofoStore fs = fofoStoreMap.get(address.getRetaierId());
-            if (pdu != null && pdu.getCounterId() != null) {
-                Counter counter = counterMap.get(pdu.getCounterId());
-                customRetailer.setGstNumber(counter != null ? counter.getGstin() : null);
+            customRetailer.setGstNumber(fs != null ? fs.getGstNumber() : null);
-            }
             CustomAddress customAddress = buildCustomAddress(address);
             customRetailer.setAddress(customAddress);
             customRetailer.setDisplayName(customRetailer.getBusinessName() + "-" + customAddress.getCity());
             customRetailersMap.put(userId, customRetailer);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java – Rev 35440 → 35896