WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java

 import com.spice.profitmandi.dao.entity.fofo.PaymentOption;
 import com.spice.profitmandi.dao.entity.onBoarding.*;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.enumuration.dtr.OtpType;
 import com.spice.profitmandi.dao.enumuration.dtr.StoreTimeline;
+import com.spice.profitmandi.dao.enumuration.fofo.StoreStatus;
 import com.spice.profitmandi.dao.enumuration.onBorading.OnboardingType;
 import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.FeePaymentStatus;
 import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.LoiStatus;
 import com.spice.profitmandi.dao.enumuration.onBorading.onBoardingFormEnums.StoreType;
 import com.spice.profitmandi.dao.enumuration.transaction.PartnerOnBoardingStatus;
 import com.spice.profitmandi.dao.service.OtpProcessor;
 import com.spice.profitmandi.dao.service.loiForm.LoiFormService;
 import com.spice.profitmandi.service.AuthService;
 import com.spice.profitmandi.service.integrations.gstpro.GstProService;
 import com.spice.profitmandi.service.integrations.gstpro.entity.GstDetails;
+import com.spice.profitmandi.service.user.StoreStatusService;
 import com.spice.profitmandi.service.user.StoreTimelineTatService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
 import org.apache.commons.lang3.tuple.Pair;
 public class LoiFormController {
     private static final Logger LOGGER = LogManager.getLogger(LoiFormController.class);
     @Autowired
     DocumentRepository documentRepository;
     @Autowired
+    private StoreStatusService storeStatusService;
+    @Autowired
     AuthRepository authRepository;
     @Autowired
     StateRepository stateRepository;
     @Autowired
     DistrictMasterRepository districtMasterRepository;
+            }
             FofoStore existing = fofoStoreRepository.selectByStoreCode(oldCode.trim());
             if (existing == null) {
                 return "Old Store Code " + oldCode + " does not exist";
+            }
+            try {
-            boolean stillActive = fofoStoreRepository.selectActiveStores().stream()
+                storeStatusService.assertRevivable(existing);
-                    .anyMatch(s -> oldCode.trim().equalsIgnoreCase(s.getCode()));
+            } catch (ProfitMandiBusinessException e) {
-            if (stillActive) {
+                return e.getCode();
-                return "Old Store Code " + oldCode + " is still active — revival is only for closed stores";
+            }
+        }
         return null;
+    }
         brandFeeCollection.setApprovalTimeStamp(LocalDateTime.now());
         if (feePaymentStatus.equals(FeePaymentStatus.CONFIRM)) {
             // Payment Approval timeline entry
             storeTimelineTatService.createStoreTimeline(brandFeeCollection.getLoiFormId(), StoreTimeline.PAYMENT_APPROVAL);
             LoiForm approvedLoi = loiFormRepository.selectById(brandFeeCollection.getLoiFormId());
-            applyRevivalPaymentHooks(approvedLoi);
+            applyRevivalPaymentHooks(approvedLoi, authEmail);
             loiFormService.checkLoiDetailsCompletion(approvedLoi);
+        }
         loiFormService.sendPaymentStatusMailToLoiFormFilledBy(brandFeeCollection);
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
     //   3. Reset the backing panel fields (billingStatus, inaugrationDate,
     //      deploymentDate, receeActual, status) and the training panel's
     //      appTraining / dashboardTraning flags so the events can actually re-fire.
     //   4. Wipe the AgreementEsign record so the upload widget starts blank.
     // No-op for NEW and ANY_OTHER LOIs.
-    private void applyRevivalPaymentHooks(LoiForm loi) throws ProfitMandiBusinessException {
+    private void applyRevivalPaymentHooks(LoiForm loi, String approvedBy) throws ProfitMandiBusinessException {
         if (loi == null || loi.getOnboardingType() != OnboardingType.REVIVAL) return;
         String oldCode = loi.getOldStoreCode();
         if (oldCode != null && !oldCode.trim().isEmpty()) {
+            // A SUSPENDED store comes back on the same code. A CLOSED store stays closed; its new code is issued
+            // when the store is created (RetailerServiceImpl.takeoverClosedStoreIdentity).
             FofoStore store = fofoStoreRepository.selectByStoreCode(oldCode.trim());
-            if (store != null && !store.isActive()) {
+            if (store != null && store.getStoreStatus() == StoreStatus.SUSPENDED) {
-                store.setActive(true);
-                store.setActiveTimeStamp(LocalDateTime.now());
+                storeStatusService.reviveSameStore(store.getId(), loi.getId(), approvedBy);
-                fofoStoreRepository.persist(store);
                 LOGGER.info("Revival PAYMENT_APPROVAL: reactivated FofoStore code=" + oldCode);
+            }
+        }
         int onboardingId = loi.getOnBoardingId();
         if (onboardingId > 0) {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java – Rev 37921 → 37936