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

         LocalDate today = LocalDate.now();
         LocalDateTime stamp = date.equals(today) ? LocalDateTime.now() : date.atTime(java.time.LocalTime.NOON);
         int written = 0, zeroTargetSkipped = 0;
+        // Cache monthly targets + MTD ACH per level so the RSM/NSM roll-up
+        // pass can reuse them without repeating queries.
+        Map<String, List<SalesHierarchyMonthlyTargetModel>> mtByLevel = new HashMap<>();
+        Map<String, Map<String, Double>> mtdByLevelKey = new HashMap<>();
         for (String[] r : roles) {
             String role = r[0];
             int catId = Integer.parseInt(r[1]);
             String levelStr = r[2];
-            // Monthly target per (authId × warehouse) for this role.
-            // Use the target date's month so backfills for past months work correctly.
             List<SalesHierarchyMonthlyTargetModel> monthlyTgts = getSalesMonthlyTargetByRole(catId, levelStr, date);
-            if (monthlyTgts.isEmpty()) continue;
+            mtByLevel.put(role, monthlyTgts);
-            // MTD achieved per (authId × warehouse) for this role. Same-day date range → MTD.
             Map<String, Double> mtdByKey = new HashMap<>();
             for (SalesHierarchyAchievedByMovementModel a :
                     getSalesAchievementByRole(catId, levelStr, monthStart, date.plusDays(1))) {
                 double totBilled =
                         a.getHidBilled()
                                 + (a.getRunningBilled() != null ? a.getRunningBilled() : 0)
                                 + (a.getSlowMovingBilled() != null ? a.getSlowMovingBilled() : 0)
                                 + (a.getOtherBilled() != null ? a.getOtherBilled() : 0);
                 mtdByKey.merge(a.getAuthId() + "-" + a.getWarehouseId(), totBilled, Double::sum);
+            }
+            mtdByLevelKey.put(role, mtdByKey);
+            // Direct-role writer — one row per (authId × warehouse) at this role.
+            if (monthlyTgts.isEmpty()) continue;
             for (SalesHierarchyMonthlyTargetModel mt : monthlyTgts) {
                 if (mt.getMonthlyTarget() <= 0) {
                     zeroTargetSkipped++;
                     continue;
+                }
                 st.setCreateTimestamp(stamp);
                 salesTargetsRepository.persist(st);
                 written++;
+            }
+        }
+        // Roll-up pass for RSM (L5) and NSM (L6) — uses distinct-partner dedup
+        // queries so partners assigned to multiple positions in the downline
+        // aren't counted more than once.
+        String[] rollUpRoles = {"RSM", "NSM"};
+        for (String rollUpRole : rollUpRoles) {
+            String levelStr = "RSM".equals(rollUpRole) ? "L5" : "L6";
+            for (AuthUser top : csService.getAuthUserByCategoryId(4, EscalationType.valueOf(levelStr))) {
+                if (!top.isActive()) continue;
+                Set<Integer> tree = new HashSet<>();
+                tree.add(top.getId());
+                List<Integer> reportees = authService.getAllReportees(top.getId());
+                if (reportees != null) tree.addAll(reportees);
+                if (tree.isEmpty()) continue;
+                // Distinct-partner monthly TGT per warehouse for the downline.
+                Map<Integer, Double> monthlyByWh = new LinkedHashMap<>();
+                for (com.spice.profitmandi.dao.model.SalesDownlineMonthlyTargetModel d :
+                        getSalesDownlineMonthlyTarget(tree, date)) {
+                    monthlyByWh.put(d.getWarehouseId(), (double) d.getMonthlyTarget());
+                }
+                // Distinct-partner MTD ACH per warehouse for the downline.
+                Map<Integer, Double> mtdByWh = new HashMap<>();
+                for (com.spice.profitmandi.dao.model.SalesDownlineAchievedByMovementModel d :
+                        getSalesDownlineAchievement(tree, monthStart, date.plusDays(1))) {
+                    double tot = d.getHidBilled() + d.getFastMovingBilled()
+                            + (d.getRunningBilled() != null ? d.getRunningBilled() : 0)
+                            + (d.getSlowMovingBilled() != null ? d.getSlowMovingBilled() : 0)
+                            + (d.getOtherBilled() != null ? d.getOtherBilled() : 0);
+                    mtdByWh.put(d.getWarehouseId(), tot);
+                }
+                for (Map.Entry<Integer, Double> e : monthlyByWh.entrySet()) {
+                    int whId = e.getKey();
+                    double monthlyTgt = e.getValue();
+                    if (monthlyTgt <= 0) {
+                        zeroTargetSkipped++;
+                        continue;
+                    }
+                    double achieved = mtdByWh.getOrDefault(whId, 0.0);
+                    double remaining = monthlyTgt - achieved;
+                    double todayTarget = (remainingWorkingDays > 0 && remaining > 0)
+                            ? remaining / remainingWorkingDays : 0;
+                    WarehouseMobileStockByMovementModel stock = whStockByWh.get(whId);
+                    if (stock == null || stock.getTotalAvailabilityPrice() <= 0) continue;
+                    float total = stock.getTotalAvailabilityPrice();
+                    SalesTargets st = new SalesTargets();
+                    st.setSalesAuthId(top.getId());
+                    st.setSalesName(top.getFullName());
+                    st.setRole(rollUpRole);
+                    st.setWarehouseId(whId);
+                    st.setHidTarget((float) ((stock.getTotalHidCatalogPrice() / total) * todayTarget));
+                    st.setFastMovingTarget((float) ((stock.getTotalFastMovingCatalogPrice() / total) * todayTarget));
+                    st.setSlowMovingTarget((float) ((stock.getTotalSlowMovingCatalogPrice() / total) * todayTarget));
+                    st.setRunningTarget((float) ((stock.getTotalRunningCatalogPrice() / total) * todayTarget));
+                    st.setOtherTarget((float) ((stock.getTotalOtherCategoryCatalogPrice() / total) * todayTarget));
+                    st.setCreateTimestamp(stamp);
+                    salesTargetsRepository.persist(st);
+                    written++;
+                }
+            }
+        }
         LOGGER.info("setSalesTargetsForDate: wrote {} sales_targets rows for {} ({} rows skipped due to zero monthly target)",
                 written, date, zeroTargetSkipped);
+    }
     @Override
         q.setParameter("refDate", refDate);
         return q.getResultList();
+    }
     @Override
+    public List<com.spice.profitmandi.dao.model.SalesDownlineAchievedByMovementModel>
+    getSalesDownlineAchievement(Collection<Integer> authIds, LocalDate startDate, LocalDate endDate) {
+        if (authIds == null || authIds.isEmpty()) return new ArrayList<>();
+        Session session = sessionFactory.getCurrentSession();
+        TypedQuery<com.spice.profitmandi.dao.model.SalesDownlineAchievedByMovementModel> q =
+                session.createNamedQuery("RbmDrr.SalesDownlineAchievedByMovement",
+                        com.spice.profitmandi.dao.model.SalesDownlineAchievedByMovementModel.class);
+        q.setParameter("authIds", authIds);
+        q.setParameter("startDate", startDate);
+        q.setParameter("endDate", endDate);
+        return q.getResultList();
+    }
+    @Override
+    public List<com.spice.profitmandi.dao.model.SalesDownlineMonthlyTargetModel>
+    getSalesDownlineMonthlyTarget(Collection<Integer> authIds, LocalDate refDate) {
+        if (authIds == null || authIds.isEmpty()) return new ArrayList<>();
+        Session session = sessionFactory.getCurrentSession();
+        TypedQuery<com.spice.profitmandi.dao.model.SalesDownlineMonthlyTargetModel> q =
+                session.createNamedQuery("RbmDrr.SalesDownlineMonthlyTarget",
+                        com.spice.profitmandi.dao.model.SalesDownlineMonthlyTargetModel.class);
+        q.setParameter("authIds", authIds);
+        q.setParameter("refDate", refDate);
+        return q.getResultList();
+    }
+    @Override
     public void setSalesAchievements() {
         setSalesAchievementsForDate(LocalDate.now());
+    }
     @Override
         LocalDate today = LocalDate.now();
         LocalDateTime stamp = date.equals(today) ? LocalDateTime.now() : date.atTime(java.time.LocalTime.NOON);
         int written = 0;
+        // Cache per-level results so the RSM/NSM roll-up pass reuses them.
+        Map<String, List<SalesHierarchyAchievedByMovementModel>> byLevel = new HashMap<>();
         for (String[] r : roles) {
             String role = r[0];
             int catId = Integer.parseInt(r[1]);
             String levelStr = r[2];
-            for (SalesHierarchyAchievedByMovementModel a :
+            List<SalesHierarchyAchievedByMovementModel> list =
-                    getSalesAchievementByRole(catId, levelStr, date, date.plusDays(1))) {
+                    getSalesAchievementByRole(catId, levelStr, date, date.plusDays(1));
+            byLevel.put(role, list);
+            for (SalesHierarchyAchievedByMovementModel a : list) {
                 SalesAchievements sa = new SalesAchievements();
                 sa.setSalesAuthId(a.getAuthId());
                 sa.setSalesName(a.getName());
                 sa.setRole(role);
                 sa.setWarehouseId(a.getWarehouseId());
                 sa.setCreateTimestamp(stamp);
                 salesAchievementsRepository.persist(sa);
                 written++;
+            }
+        }
+        // Roll-up pass for RSM (L5) and NSM (L6) — uses distinct-partner dedup
+        // query so partners assigned to multiple positions in the downline
+        // don't have their orders counted more than once.
+        String[] rollUpRoles = {"RSM", "NSM"};
+        for (String rollUpRole : rollUpRoles) {
+            String levelStr = "RSM".equals(rollUpRole) ? "L5" : "L6";
+            for (AuthUser top : csService.getAuthUserByCategoryId(4, EscalationType.valueOf(levelStr))) {
+                if (!top.isActive()) continue;
+                Set<Integer> tree = new HashSet<>();
+                tree.add(top.getId());
+                List<Integer> reportees = authService.getAllReportees(top.getId());
+                if (reportees != null) tree.addAll(reportees);
+                if (tree.isEmpty()) continue;
+                for (com.spice.profitmandi.dao.model.SalesDownlineAchievedByMovementModel d :
+                        getSalesDownlineAchievement(tree, date, date.plusDays(1))) {
+                    SalesAchievements sa = new SalesAchievements();
+                    sa.setSalesAuthId(top.getId());
+                    sa.setSalesName(top.getFullName());
+                    sa.setRole(rollUpRole);
+                    sa.setWarehouseId(d.getWarehouseId());
+                    sa.setAchievedHidTarget(d.getHidBilled());
+                    sa.setAchievedFastMovingTarget(d.getFastMovingBilled());
+                    sa.setAchievedRunningTarget(d.getRunningBilled() != null ? d.getRunningBilled() : 0f);
+                    sa.setAchievedSlowMovingTarget(d.getSlowMovingBilled() != null ? d.getSlowMovingBilled() : 0f);
+                    sa.setAchievedOtherTarget(d.getOtherBilled() != null ? d.getOtherBilled() : 0f);
+                    sa.setCreateTimestamp(stamp);
+                    salesAchievementsRepository.persist(sa);
+                    written++;
+                }
+            }
+        }
         LOGGER.info("setSalesAchievementsForDate: wrote {} sales_achievements rows for {}", written, date);
+    }
     @Override
     public void setMovementWiseRbmAchievement() {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java – Rev 37505 → 37519