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

         Retailer retailer = (Retailer) map.get("retailer");
         retailer = this.updateRetailer(dtrUser, retailer, updateRetailerRequest);
         map.put("retailer", retailer);
+        // Ensure UserAccount links new dtr user to retailer (handles case where
+        // dtr.user was deleted and re-created with a new ID)
+        try {
+            userAccountRepository.selectSaholicByUserId(dtrUser.getId());
+        } catch (ProfitMandiBusinessException e) {
+            try {
+                UserAccount ua = new UserAccount();
+                ua.setAccountKey(retailer.getId());
+                ua.setUserId(dtrUser.getId());
+                ua.setType(AccountType.saholic);
+                userAccountRepository.persist(ua);
+            } catch (Exception ex) {
+                LOGGER.error("Error creating saholic UserAccount for userId: {}", dtrUser.getId(), ex);
+            }
+        }
         List<String> retailerBlockBrands = retailerBlockBrandsRepository.selectAllByRetailer(retailer.getId()).stream().map(x -> x.getBlockBrands()).collect(Collectors.toList());
         LOGGER.info("retailerBlockBrands" + retailerBlockBrands);
         if (!retailerBlockBrands.isEmpty()) {
+    }
     private Address updateRetailerAddress(Address address, CustomAddress customAddress, int retailerId) throws
             ProfitMandiBusinessException {
         if (address == null) {
+            // Try to find existing address via RetailerRegisteredAddress (handles case where
+            // dtr.user was deleted but retailer/address still exist in database)
-            address = new Address();
+            try {
+                int existingAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(retailerId);
-            address.setRetaierId(retailerId);
+                address = addressRepository.selectById(existingAddressId);
-            this.updateAddress(address, customAddress);
+            } catch (ProfitMandiBusinessException e) {
-            // addressRepository.persist(addressRetailer);
+                // No existing address found for this retailer
+            }
+            if (address != null) {
+                // Existing address found - update it
+                this.updateAddress(address, customAddress);
+                RetailerRegisteredAddress retailerRegisteredAddress = retailerRegisteredAddressRepository.selectByRetailerId(retailerId);
+                retailerRegisteredAddress.setAddressId(address.getId());
+                retailerRegisteredAddressRepository.persist(retailerRegisteredAddress);
+            } else {
+                // Truly new address
+                address = new Address();
+                address.setRetaierId(retailerId);
+                this.updateAddress(address, customAddress);
-            final RetailerRegisteredAddress retailerRegisteredAddress = new RetailerRegisteredAddress();
+                final RetailerRegisteredAddress retailerRegisteredAddress = new RetailerRegisteredAddress();
-            retailerRegisteredAddress.setRetailerId(retailerId);
+                retailerRegisteredAddress.setRetailerId(retailerId);
-            retailerRegisteredAddress.setAddressId(address.getId());
+                retailerRegisteredAddress.setAddressId(address.getId());
-            retailerRegisteredAddressRepository.persist(retailerRegisteredAddress);
+                retailerRegisteredAddressRepository.persist(retailerRegisteredAddress);
+            }
         } else {
             this.updateAddress(address, customAddress);
             RetailerRegisteredAddress retailerRegisteredAddress = retailerRegisteredAddressRepository.selectByRetailerId(retailerId);
             retailerRegisteredAddress.setAddressId(address.getId());
             retailerRegisteredAddressRepository.persist(retailerRegisteredAddress);
             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) {
-                PartnerVerificationpanel partnerVerificationpanel = partnerOnboardingVerificationRepository.selectByOnboardingId(pobp.getId());
-                if (partnerVerificationpanel != null) {
-                    if (partnerVerificationpanel.getApproval().equals(PartnerVerificationApprovalStatus.YES)) {
-                        pobp.setCode(fofoStore.getCode());
-                        storeTimelineTatService.onCodeCreated(pobp.getId());
-                    }
-                }
-            }
             PincodePartner pincodePartner = pincodePartnerRepository.selectPartnerByPincode(retailerAddress.getPinCode(), fofoStore.getId());
             if (pincodePartner == null) {
                 PincodePartner pinPartner = new PincodePartner();
                 pinPartner.setFofoId(fofoStore.getId());
                 pinPartner.setPincode(retailerAddress.getPinCode());
                 pincodePartnerRepository.perist(pinPartner);
+            }
+        }
+        // Link store code to onboarding panel and create STORE_CODE_CREATED timeline
+        // Runs for BOTH new and existing fofoStore to handle retry scenarios
+        if (fofoStore != null && fofoStore.getCode() != null && !fofoStore.getCode().isEmpty()) {
+            try {
+                int addressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(retailerId);
+                Address addr = addressRepository.selectById(addressId);
+                PartnerOnBoardingPanel pobp = partnerOnBoardingPanelRepository.selectByPhoneNumber(Long.parseLong(addr.getPhoneNumber()));
+                if (pobp != null) {
+                    PartnerVerificationpanel partnerVerificationpanel = partnerOnboardingVerificationRepository.selectByOnboardingId(pobp.getId());
+                    if (partnerVerificationpanel != null
+                            && PartnerVerificationApprovalStatus.YES.equals(partnerVerificationpanel.getApproval())) {
+                        pobp.setCode(fofoStore.getCode());
+                        storeTimelineTatService.onCodeCreated(pobp.getId());
+                        PartnerVerificationCheckboxes cb = partnerOnboardingVerificationRepository
+                                .selectVerifiCheckboxByOnboardingId(pobp.getId());
+                        if (cb == null) {
+                            cb = new PartnerVerificationCheckboxes();
+                            cb.setOnboardingId(pobp.getId());
+                            partnerOnboardingVerificationRepository.persist(cb);
+                        }
+                    }
+                } else {
+                    LOGGER.warn("No onboarding panel entry found for phone {}. Store code {} created for retailer {} " +
+                                    "but not linked to onboarding panel.",
+                            addr.getPhoneNumber(), fofoStore.getCode(), retailerId);
+                }
+            } catch (Exception e) {
+                LOGGER.error("Failed to link store code to onboarding panel for retailerId: {}. " +
+                        "Store code was created successfully but timeline/email may be incomplete.", retailerId, e);
+            }
+        }
         if (fofoStore.isTrial()) {
             storeTimelineTatService.sendTrialStoreCreationMail(fofoStore, updateRetailerRequest);
             storeTimelineTatService.sendTrialActivationMail(fofoStore, updateRetailerRequest);

Subversion Repositories SmartDukaan

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