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;
-        List<FofoStore> candidates = fofoStoreRepository.selectByStatus(true).stream().filter(x-> !x.isInternal()).collect(toList());
+        List<FofoStore> candidates = fofoStoreRepository.selectAllFranchiseStores().stream()
+                .filter(s -> s.isActive() && !s.isInternal() && !s.isClosed())
+                .filter(s -> s.getActivationType() == ActivationType.ACTIVE
+                        || s.getActivationType() == ActivationType.FOCUS)
+                .collect(Collectors.toList());
         if (candidates.isEmpty()) {
             LOGGER.info("updatePartnerActivationTypeByMonthlySale: no candidate stores");
             return;
+        }
             if (target != current) {
                 LOGGER.info("Auto-downgrade fofoId={} code={} from {} to {} (below30={}, below60={})",
                         id, store.getCode(), current, target, below30, below60);
                 store.setActivationType(target);
-                store.setActive(false);
-                store.setActiveTimeStamp(null);
                 fofoStoreRepository.persist(store);
                 if (target == ActivationType.FOCUS) {
                     toFocus++;
                 } else {
                     toRevival++;

Subversion Repositories SmartDukaan