WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

         LocalDateTime now = LocalDateTime.now();
         LocalDateTime thirtyDaysAgo = now.minusDays(30);
         LocalDateTime sixtyDaysAgo = now.minusDays(60);
         long threshold = 99_999L;
+        // Include REVIVAL now so previously-downgraded stores can be promoted back to ACTIVE
+        // when they resume billing above the threshold in the last 30 days.
         List<FofoStore> candidates = fofoStoreRepository.selectAllFranchiseStores().stream()
                 .filter(s -> s.isActive() && !s.isInternal() && !s.isClosed())
                 .filter(s -> s.getActivationType() == ActivationType.ACTIVE
-                        || s.getActivationType() == ActivationType.FOCUS)
+                        || s.getActivationType() == ActivationType.FOCUS
+                        || s.getActivationType() == ActivationType.REVIVAL)
                 .collect(Collectors.toList());
         if (candidates.isEmpty()) {
             LOGGER.info("updatePartnerActivationTypeByMonthlySale: no candidate stores");
             return;
         Set<Integer> met30 = orderRepository.selectFofoIdsWithMtdBillingAboveThreshold(ids, thirtyDaysAgo, now, threshold);
         Set<Integer> met60 = orderRepository.selectFofoIdsWithMtdBillingAboveThreshold(ids, sixtyDaysAgo, now, threshold);
         int toFocus = 0;
         int toRevival = 0;
+        int toActive = 0;
         for (FofoStore store : candidates) {
             int id = store.getId();
-            boolean below30 = !met30.contains(id);
+            boolean above30 = met30.contains(id);
+            boolean below30 = !above30;
             boolean below60 = !met60.contains(id);
             ActivationType current = store.getActivationType();
             ActivationType target = current;
+            // Promotion — asymmetric windows by current status:
+            //   FOCUS   → ACTIVE if billed > ₹99,999 in the last 30 days (recent activity required)
+            //   REVIVAL → ACTIVE if billed > ₹99,999 in the last 60 days (deeper trouble, so any
+            //             sign of life in the last 2 months earns a promotion)
+            // Evaluated ahead of the downgrade rules so a recently-billing REVIVAL isn't held at
+            // REVIVAL by the below60 rule below.
+            if (current == ActivationType.FOCUS && above30) {
+                target = ActivationType.ACTIVE;
+            } else if (current == ActivationType.REVIVAL && met60.contains(id)) {
+                target = ActivationType.ACTIVE;
-            if (below60) {
+            } else if (below60) {
                 target = ActivationType.REVIVAL;
             } else if (below30 && current == ActivationType.ACTIVE) {
                 target = ActivationType.FOCUS;
+            }
             if (target != current) {
+                // Safety guard only applies to downgrades — never auto-downgrade a store that
+                // has never billed yet. Promotions to ACTIVE always allowed (billing observed).
+                if (target != ActivationType.ACTIVE) {
-                LocalDateTime firstBillingDate = transactionRepository.getFirstBillingDate(id);
+                    LocalDateTime firstBillingDate = transactionRepository.getFirstBillingDate(id);
-                if (firstBillingDate == null) {
+                    if (firstBillingDate == null) {
-                    LOGGER.info("Skip auto-downgrade fofoId={} code={}: first billing pending",
+                        LOGGER.info("Skip auto-downgrade fofoId={} code={}: first billing pending",
-                            id, store.getCode());
+                                id, store.getCode());
-                    continue;
+                        continue;
+                    }
+                }
-                LOGGER.info("Auto-downgrade fofoId={} code={} from {} to {} (below30={}, below60={})",
+                LOGGER.info("Auto-{} fofoId={} code={} from {} to {} (above30={}, below60={})",
+                        target == ActivationType.ACTIVE ? "promote" : "downgrade",
-                        id, store.getCode(), current, target, below30, below60);
+                        id, store.getCode(), current, target, above30, below60);
                 store.setActivationType(target);
                 fofoStoreRepository.persist(store);
                 if (target == ActivationType.FOCUS) {
                     toFocus++;
-                } else {
+                } else if (target == ActivationType.REVIVAL) {
                     toRevival++;
+                } else if (target == ActivationType.ACTIVE) {
+                    toActive++;
+                }
+            }
+        }
-        LOGGER.info("updatePartnerActivationTypeByMonthlySale done: scanned={}, toFocus={}, toRevival={}",
+        LOGGER.info("updatePartnerActivationTypeByMonthlySale done: scanned={}, toFocus={}, toRevival={}, toActive={}",
-                candidates.size(), toFocus, toRevival);
+                candidates.size(), toFocus, toRevival, toActive);
+    }
     public void sendAgeingReport() throws Exception {
         sendAgeingReport("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "niranjan.kala@smartdukaan.com", "kuldeep.kumar@smartdukaan.com");
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java – Rev 37128 → 37154