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

 import com.spice.profitmandi.dao.entity.auth.RbmCallSequenceLog;
 import com.spice.profitmandi.dao.entity.cs.Position;
 import com.spice.profitmandi.dao.entity.cs.Ticket;
 import com.spice.profitmandi.dao.entity.fofo.FofoStore;
 import com.spice.profitmandi.dao.entity.fofo.MonthlyTarget;
+import com.spice.profitmandi.dao.entity.fofo.RetailerContact;
 import com.spice.profitmandi.dao.entity.inventory.RbmAchievements;
 import com.spice.profitmandi.dao.entity.inventory.RbmTargets;
+import com.spice.profitmandi.dao.entity.user.Address;
 import com.spice.profitmandi.dao.enumuration.auth.CollectionRemark;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.model.*;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.auth.PartnerCollectionRemarkRepository;
 import com.spice.profitmandi.dao.repository.catalog.RbmAchievementsRepository;
 import com.spice.profitmandi.dao.repository.catalog.RbmTargetsRepository;
 import com.spice.profitmandi.dao.repository.cs.CsService;
 import com.spice.profitmandi.dao.repository.cs.PositionRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
+import com.spice.profitmandi.dao.repository.dtr.RetailerContactRepository;
 import com.spice.profitmandi.dao.repository.fofo.MonthlyTargetRepository;
 import com.spice.profitmandi.dao.repository.logistics.PublicHolidaysRepository;
 import com.spice.profitmandi.dao.repository.transaction.LoanRepository;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
+import com.spice.profitmandi.dao.repository.user.AddressRepository;
 import com.spice.profitmandi.service.user.RetailerService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
     com.spice.profitmandi.dao.repository.cs.TicketRepository ticketRepository;
     @Autowired
     com.spice.profitmandi.dao.repository.cs.AgentCallLogRepository agentCallLogRepository;
+    @Autowired
+    RetailerContactRepository retailerContactRepository;
+    @Autowired
+    AddressRepository addressRepository;
     @Override
     public List<RbmCallTargetModel> getRbmCallTargetModels() throws Exception {
         long methodStart = System.currentTimeMillis();
         List<RbmCallTargetModel> rbmCallTargetModels = new ArrayList<>();
         return getCalledPartnerDetails(authId, LocalDate.now());
+    }
     @Override
     public List<CalledPartnerDetailModel> getCalledPartnerDetails(int authId, LocalDate date) throws ProfitMandiBusinessException {
-        LocalDate today = date;
-        LocalDateTime startDate = today.atStartOfDay();
-        LocalDate firstOfMonth = today.withDayOfMonth(1);
-        LocalDate endOfMonth = today.withDayOfMonth(today.lengthOfMonth()).plusDays(1);
-        // Get auth user
-        List<AuthUser> authUsers = authRepository.selectByIds(Collections.singletonList(authId));
-        if (authUsers.isEmpty()) {
-            return Collections.emptyList();
-        }
-        AuthUser authUser = authUsers.get(0);
-        // Check if L1 or L2
-        List<Position> positions = positionRepository.selectPositionByAuthIds(Collections.singletonList(authId));
-        boolean isL2 = positions.stream()
-                .anyMatch(p -> ProfitMandiConstants.TICKET_CATEGORY_RBM == p.getCategoryId()
-                        && EscalationType.L2.equals(p.getEscalationType()));
-        // Get fofo IDs for this RBM
+        // Get all call logs for this auth user on this date
-        List<Integer> fofoIdList;
-        if (isL2) {
-            // L2: get fofo IDs from escalated tickets (all escalated tickets are target)
-            List<Ticket> escalatedTickets = ticketRepository.selectOpenEscalatedTicketsByAuthIds(Collections.singletonList(authId));
+        List<com.spice.profitmandi.dao.entity.cs.AgentCallLog> callLogs = agentCallLogRepository.findByAuthIdAndDate(authId, date);
-            fofoIdList = escalatedTickets.stream()
-                    .filter(t -> t.getL2AuthUser() == authId
-                            || t.getL3AuthUser() == authId
-                            || t.getL4AuthUser() == authId
-                            || t.getL5AuthUser() == authId)
-                    .map(Ticket::getFofoId)
-                    .distinct()
-                    .collect(Collectors.toList());
-            // Get today's remarks created by L2 (all remarks, not deduplicated)
-            List<PartnerCollectionRemark> todayRemarks = partnerCollectionRemarkRepository
-                    .selectAllByAuthIdsOnDate(Collections.singletonList(authId), today);
-            return buildCalledPartnerResult(todayRemarks);
-        }
-        // L1 Logic
-        Map<String, Set<Integer>> storeGuyMap;
-        try {
-            storeGuyMap = csService.getAuthUserPartnerIdMapping();
-        } catch (ProfitMandiBusinessException e) {
+        if (callLogs.isEmpty()) {
-            LOGGER.error("Error fetching store guy map", e);
             return Collections.emptyList();
+        }
-        if (!storeGuyMap.containsKey(authUser.getEmailId())) {
+        // Build a map of normalized customer number -> fofoId
+        Map<String, Integer> customerToFofoIdMap = new HashMap<>();
+        Set<String> normalizedNumbers = new HashSet<>();
+        for (com.spice.profitmandi.dao.entity.cs.AgentCallLog callLog : callLogs) {
+            String customerNumber = callLog.getCustomerNumber();
-            return Collections.emptyList();
+            if (customerNumber != null) {
+                String normalized = customerNumber.startsWith("+91") ? customerNumber.substring(3) : customerNumber;
+                normalizedNumbers.add(normalized);
+            }
+        }
-        fofoIdList = new ArrayList<>(storeGuyMap.get(authUser.getEmailId()));
+        // For each normalized number, find fofoId from retailer_contact first, then address
+        for (String mobile : normalizedNumbers) {
+            Integer fofoId = findFofoIdByMobile(mobile);
-        if (fofoIdList.isEmpty()) {
+            if (fofoId != null) {
-            return Collections.emptyList();
+                customerToFofoIdMap.put(mobile, fofoId);
+            }
+        }
-        // Get fofo stores for filtering
+        // Get unique fofoIds for retailer lookup
+        Set<Integer> fofoIds = new HashSet<>(customerToFofoIdMap.values());
-        Map<Integer, FofoStore> fofoStoresMap;
+        Map<Integer, CustomRetailer> retailerMap = Collections.emptyMap();
+        if (!fofoIds.isEmpty()) {
-        try {
+            try {
-            fofoStoresMap = fofoStoreRepository.selectByRetailerIds(fofoIdList).stream()
+                retailerMap = retailerService.getFofoRetailers(new ArrayList<>(fofoIds));
-                    .collect(Collectors.toMap(FofoStore::getId, x -> x, (a, b) -> a));
-        } catch (ProfitMandiBusinessException e) {
+            } catch (ProfitMandiBusinessException e) {
-            LOGGER.error("Error fetching fofo stores", e);
+                LOGGER.error("Error fetching fofo stores", e);
-            return Collections.emptyList();
+            }
+        }
-        // Filter escalated partners for L1
+        // Get today's remarks for these fofoIds
-        List<Integer> allRemarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIdList);
+        Map<Integer, List<PartnerCollectionRemark>> fofoRemarkMap = new HashMap<>();
-        if (!allRemarkIds.isEmpty()) {
+        if (!fofoIds.isEmpty()) {
-            Map<Integer, PartnerCollectionRemark> partnerCollectionRemarks = partnerCollectionRemarkRepository.selectByIds(allRemarkIds).stream()
+            List<PartnerCollectionRemark> todayRemarks = partnerCollectionRemarkRepository
-                    .collect(Collectors.toMap(PartnerCollectionRemark::getFofoId, x -> x, (a, b) -> a));
+                    .selectAllByFofoIdsOnDate(new ArrayList<>(fofoIds), date);
-            fofoIdList = partnerCollectionRemarks.entrySet().stream()
-                    .filter(entry -> {
-                        PartnerCollectionRemark pcrMap = entry.getValue();
+            for (PartnerCollectionRemark remark : todayRemarks) {
-                        return !(CollectionRemark.RBM_L2_ESCALATION.equals(pcrMap.getRemark())
+                fofoRemarkMap.computeIfAbsent(remark.getFofoId(), k -> new ArrayList<>()).add(remark);
-                                || CollectionRemark.SALES_ESCALATION.equals(pcrMap.getRemark()));
-                    })
+            }
-                    .map(Map.Entry::getKey)
-                    .collect(Collectors.toList());
+        }
-        // Filter to only external, ACTIVE stores
-        List<Integer> validFofoIds = fofoIdList.stream()
-                .filter(fofoId -> {
-                    FofoStore store = fofoStoresMap.get(fofoId);
+        DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("hh:mm a");
-                    if (store == null || store.isInternal()) {
-                        return false;
-                    }
-                    return ActivationType.ACTIVE.equals(store.getActivationType());
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd-MM-yyyy hh:mm a");
-                })
-                .collect(Collectors.toList());
+        List<CalledPartnerDetailModel> result = new ArrayList<>();
+        for (com.spice.profitmandi.dao.entity.cs.AgentCallLog callLog : callLogs) {
+            String customerNumber = callLog.getCustomerNumber();
-        if (validFofoIds.isEmpty()) {
+            if (customerNumber == null) {
-            return Collections.emptyList();
+                continue;
-        }
+            }
-        // Get collection rank map
-        Map<Integer, Integer> collectionRankMap;
-        try {
-            collectionRankMap = partnerCollectionService.getCollectionRankMap(validFofoIds, startDate);
+            String normalized = customerNumber.startsWith("+91") ? customerNumber.substring(3) : customerNumber;
-        } catch (ProfitMandiBusinessException e) {
-            LOGGER.error("Error fetching collection rank map", e);
+            Integer fofoId = customerToFofoIdMap.get(normalized);
-            collectionRankMap = new HashMap<>();
-        }
-        // Get MTD billing data for zero billing check
+            String partyName = "Unknown";
+            String code = "-";
+            if (fofoId != null) {
-        List<RbmWeeklyBillingModel> mtdBillingData = getWeeklyBillingDataForMonth(firstOfMonth, endOfMonth);
+                CustomRetailer retailer = retailerMap.get(fofoId);
+                if (retailer != null) {
-        Set<Integer> mtdBilledFofoIds = mtdBillingData.stream()
+                    partyName = retailer.getBusinessName();
-                .filter(RbmWeeklyBillingModel::isMtdBilled)
+                    code = retailer.getCode();
+                } else {
-                .map(RbmWeeklyBillingModel::getFofoId)
+                    partyName = "Unknown (" + fofoId + ")";
+                }
+            } else {
-                .collect(Collectors.toSet());
+                partyName = "Unknown (" + normalized + ")";
+            }
+            // Get remark if available
+            String remarkValue = "-";
+            String messageValue = "-";
+            String remarkTime = "-";
-        // Build target partner set (PlanToday + CarryForward + ZeroBilling + Untouched)
+            if (fofoId != null && fofoRemarkMap.containsKey(fofoId)) {
-        Set<Integer> targetFofoIds = new HashSet<>();
+                List<PartnerCollectionRemark> remarks = fofoRemarkMap.get(fofoId);
-        for (Integer fofoId : validFofoIds) {
+                if (!remarks.isEmpty()) {
-            int rank = collectionRankMap.getOrDefault(fofoId, 5);
+                    PartnerCollectionRemark remark = remarks.get(0);
+                    remarkValue = remark.getRemark() != null ? remark.getRemark().getValue() : "-";
-            boolean hasZeroBilling = !mtdBilledFofoIds.contains(fofoId);
+                    messageValue = remark.getMessage() != null ? remark.getMessage() : "-";
+                    remarkTime = remark.getCreateTimestamp() != null ? remark.getCreateTimestamp().format(timeFormatter) : "-";
+                }
+            }
+            // Build call log data
-            // Same priority logic as in getRbmCallTargetModels
+            String recordingUrl = callLog.getRecordingUrl();
+            String callStatus = callLog.getCallStatus();
-            if (rank == 1 || rank == 2 || hasZeroBilling || rank == 3) {
+            String callDuration = callLog.getCallDuration();
-                targetFofoIds.add(fofoId);
+            String callDateTime = null;
+            if (callLog.getCallDate() != null && callLog.getCallTime() != null) {
+                LocalDateTime callDateTimeObj = LocalDateTime.of(callLog.getCallDate(), callLog.getCallTime());
+                callDateTime = callDateTimeObj.format(dateTimeFormatter);
+            }
+            result.add(new CalledPartnerDetailModel(partyName, code, remarkValue, messageValue, remarkTime,
-            // rank 4 (FuturePlan) and rank 5 (Normal) are NOT in target
+                    recordingUrl, callStatus, callDuration, callDateTime));
+        }
+        return result;
+    }
+    private Integer findFofoIdByMobile(String mobile) {
-        // Get today's remarks created by L1 (all remarks, not deduplicated)
+        // First check retailer_contact
-        List<PartnerCollectionRemark> todayRemarks = partnerCollectionRemarkRepository
+        List<RetailerContact> contacts = retailerContactRepository.selectByMobile(mobile);
+        if (contacts != null && !contacts.isEmpty()) {
+            return contacts.get(0).getFofoId();
+        }
+        // Fallback to user.address
-                .selectAllByAuthIdsOnDate(Collections.singletonList(authId), today);
+        Address address = addressRepository.selectByPhoneNumber(mobile);
+        if (address != null) {
+            return address.getRetaierId();
+        }
-        return buildCalledPartnerResult(todayRemarks);
+        return null;
+    }
     private List<CalledPartnerDetailModel> buildCalledPartnerResult(List<PartnerCollectionRemark> allRemarks) {
         if (allRemarks.isEmpty()) {
             return Collections.emptyList();

Subversion Repositories SmartDukaan

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