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

             rechargeTransactionRepository.persist(rt);
+        }
         LOGGER.info("Cashbacks for Recharge processed Successfully");
+    }
-    public void rollOutUpgardedMarginsNextMonth() throws Exception {
+    public void rollOutUpgardedMarginsNextMonth(List<Integer> fofoIds) throws Exception {
         LocalDate startOfPreviousMonth = LocalDate.now().with(ChronoField.DAY_OF_MONTH, 1).minusMonths(1);
+        List<FofoStore> stores;
+        if (fofoIds != null || fofoIds.isEmpty()) {
-        List<FofoStore> stores = fofoStoreRepository.selectActiveStores();
+            stores = fofoStoreRepository.selectActiveStores();
+        } else {
+            stores = fofoStoreRepository.selectByRetailerIds(fofoIds);
+        }
         for (FofoStore store : stores) {
             this.rolloutMarginForStoreOnMonth(store, startOfPreviousMonth);
+        }
+    }
+            }
+        }
+    }
-    public void rollOutUpgardedMargins() throws Exception {
+    public void rollOutUpgardedMargins(List<Integer> fofoIds) throws Exception {
         LocalDate today = LocalDate.now();
         LocalDate yesterday = today.minusDays(1);
         int upgradedCount = 0;
+        List<FofoStore> stores;
+        if (fofoIds == null || fofoIds.isEmpty()) {
-        List<FofoStore> stores = fofoStoreRepository.selectActiveStores();
+            stores = fofoStoreRepository.selectActiveStores();
+        } else {
+            stores = fofoStoreRepository.selectByRetailerIds(fofoIds);
+        }
         // Bulk fetch partner types to avoid N+1 queries
-        List<Integer> fofoIds = stores.stream().map(FofoStore::getId).collect(Collectors.toList());
         Map<Integer, PartnerType> yesterdayTypeMap = partnerTypeChangeService.getTypesForFofoIds(fofoIds, yesterday);
         Map<Integer, PartnerType> todayTypeMap = partnerTypeChangeService.getTypesForFofoIds(fofoIds, today);
         StringBuilder sb = new StringBuilder();
         for (FofoStore store : stores) {
+    }
     @Autowired
     private PartnerStatsService partnerStatsService;
-    // Temporary Method
+// Temporary Method
     public void fetchParnterStats() throws Exception {
         Map<Integer, PartnerDetailModel> partnerStats = partnerStatsService.getAllPartnerStats();
         ObjectOutputStream oos = null;
         FileOutputStream fout = null;
     public void processDeductions() {
         sidbiService.processDeductions();
+    }
-    public void resetHardLimit() throws  ProfitMandiBusinessException{
+    public void resetHardLimit() throws ProfitMandiBusinessException {
         sdCreditService.resetHardLimit();
+    }
     public void testInvoiceFormat() throws ProfitMandiBusinessException {
         InvoicePdfModel invoicePdfModel = orderService.getInvoicePdfModel(560280);
         //System.out.println(InvoiceFormatter.buildInvoiceLines(invoicePdfModel, InvoiceFormatter.WIDTH_80MM));
+    }
     public void sendTrialExpiry() {
         List<FofoStore> stores = fofoStoreRepository.selectAllTrial();
-        List<FofoStore> twoDaysToExpiry = stores.stream().filter(x->x.getTrialEnd().minusDays(2).equals(LocalDate.now())).collect(Collectors.toList());
+        List<FofoStore> twoDaysToExpiry = stores.stream().filter(x -> x.getTrialEnd().minusDays(2).equals(LocalDate.now())).collect(Collectors.toList());
-        List<FofoStore> fiveDaysToExpiry = stores.stream().filter(x->x.getTrialEnd().minusDays(5).equals(LocalDate.now())).collect(Collectors.toList());
+        List<FofoStore> fiveDaysToExpiry = stores.stream().filter(x -> x.getTrialEnd().minusDays(5).equals(LocalDate.now())).collect(Collectors.toList());
-        List<FofoStore> expiredToday = stores.stream().filter(x->x.getTrialEnd().equals(LocalDate.now())).collect(Collectors.toList());
+        List<FofoStore> expiredToday = stores.stream().filter(x -> x.getTrialEnd().equals(LocalDate.now())).collect(Collectors.toList());
-        List<FofoStore> expired = stores.stream().filter(x->x.getTrialEnd().isAfter(LocalDate.now())).collect(Collectors.toList());
+        List<FofoStore> expired = stores.stream().filter(x -> x.getTrialEnd().isAfter(LocalDate.now())).collect(Collectors.toList());
+    }
     /*public void processCashDiscount() throws ProfitMandiBusinessException {
         System.out.println("processing cash discount");
         List<Loan> loansSettledYesterday = loanRepository.selectLoansSettledOn(LocalDate.now().minusDays(1));
     @Autowired
     AbmReportSender abmReportSender;
     public void sendOverDueReport() {
         List<Loan> loans = loanRepository.selectAllActiveLoan();
-        Map<Integer, List<Loan>> partnerLoansMap = loans.stream().filter(x->x.isOverdue()).collect(Collectors.groupingBy(x->x.getFofoId()));
+        Map<Integer, List<Loan>> partnerLoansMap = loans.stream().filter(x -> x.isOverdue()).collect(Collectors.groupingBy(x -> x.getFofoId()));
         //sdCreditService.getDueDateCrossLoan()
-        partnerLoansMap.entrySet().stream().forEach(x->{
+        partnerLoansMap.entrySet().stream().forEach(x -> {
             x.getKey();
             x.getValue().size();
         });
     @Autowired
     com.spice.profitmandi.service.integrations.pinelabs.PinelabsAffordabilityService pinelabsAffordabilityService;
     @Autowired
     com.spice.profitmandi.service.integrations.pinelabs.PinelabsAuthService pinelabsAuthService;
     public void testAffordability() {
         Money orderAmount = new Money("1000000", "INR");
         Money discountAmount = new Money("0", "INR");
         List<ProductDetails> productDetails = Arrays.asList(new ProductDetails(orderAmount, discountAmount, "Alpha_2"));
         OfferDiscoveryRequest offerDiscoveryRequest = new com.spice.profitmandi.service.integrations.pinelabs.dto.OfferDiscoveryRequest(orderAmount, productDetails, new AffordabilityIssuer("12345678"));
         OfferDiscoveryResponse offerDiscoveryResponse = pinelabsAffordabilityService.discoverOffers(offerDiscoveryRequest);
         System.out.println(offerDiscoveryResponse);
+    }
     public void test() throws Exception {
         System.out.println(pinelabsAuthService.getAccessToken());
         testAffordability();
         List<Loan> blockedLoans = loanRepository.selectAllBlockedLoans();
         for (Loan blockedLoan : blockedLoans) {
             LoanTransaction loanTransaction = loanTransactionRepository.selectByLoanId(blockedLoan.getId());
             int transactionId = loanTransaction.getTransactionId();
             List<UserWalletHistory> userWalletHistory = walletService.getAllByReference(blockedLoan.getFofoId(), transactionId, WalletReferenceType.PURCHASE);
-            int amount = userWalletHistory.get(userWalletHistory.size()-1).getAmount();
+            int amount = userWalletHistory.get(userWalletHistory.size() - 1).getAmount();
             int loanAmount = blockedLoan.getIntialAmount().intValue();
-            if(loanAmount > -amount) {
+            if (loanAmount > -amount) {
-                sdCreditService.settleBlockedLoan(transactionId, loanAmount+amount);
+                sdCreditService.settleBlockedLoan(transactionId, loanAmount + amount);
+            }
+        }
+    }
     @Autowired
     LoanTransactionRepository loanTransactionRepository;
     private Map<Integer, FofoReportingModel> getPartnerIdSalesHeaders() throws ProfitMandiBusinessException {
         Map<String, SaleRoles> partnerEmailSalesMap = new HashMap<>();
         Map<String, SaleRoles> partnerEmailRBMMap = new HashMap<>();
         Map<String, SaleRoles> partnerEmailABMMap = new HashMap<>();
-        List<Position> positions = positionRepository.selectPositionByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_RBM,ProfitMandiConstants.TICKET_CATEGORY_ABM));
+        List<Position> positions = positionRepository.selectPositionByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_ABM));
         Map<Integer, AuthUser> authUsersMap = authRepository.selectAllActiveUser().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
         Map<Integer, List<CustomRetailer>> positionIdRetailerMap = csService.getPositionCustomRetailerMap(positions);
         for (Position position : positions) {
             List<CustomRetailer> crList = positionIdRetailerMap.get(position.getId());
             if (crList == null)
                         continue;
+                    }
                     String name = authUser.getFirstName() + " " + authUser.getLastName();
                     if (position.getEscalationType().equals(EscalationType.L1) || position.getEscalationType().equals(EscalationType.L1)) {
                         saleRoles.getL1().add(name);
-                    }
-                    else if (position.getEscalationType().equals(EscalationType.L2)) {
+                    } else if (position.getEscalationType().equals(EscalationType.L2)) {
                         saleRoles.getL2().add(name);
+                    }
+                }
+            }
             Exception {
         String timeString = "Today %s";
         LocalDateTime now = LocalDateTime.now();
         DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("h:m a");
-        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_LOGISTICS, ProfitMandiConstants.TICKET_CATEGORY_FINANCIAL_SERVICES, ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,ProfitMandiConstants.TICKET_CATEGORY_ABM, ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT, ProfitMandiConstants.TICKET_CATEGORY_TECHNOLOGY);
+        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_LOGISTICS, ProfitMandiConstants.TICKET_CATEGORY_FINANCIAL_SERVICES, ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_ABM, ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT, ProfitMandiConstants.TICKET_CATEGORY_TECHNOLOGY);
         Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false);
         for (Entry<String, Set<Integer>> storeGuyEntry : storeGuyMap.entrySet()) {
             String email = storeGuyEntry.getKey();
+                }
+            }
             if (!salesEscalatedRemarksMap.isEmpty()) {
                 //
-                for (Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_SALES,ProfitMandiConstants.TICKET_CATEGORY_ABM, ProfitMandiConstants.TICKET_CATEGORY_RBM), true).entrySet()) {
+                for (Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_ABM, ProfitMandiConstants.TICKET_CATEGORY_RBM), true).entrySet()) {
                     List<PartnerCollectionRemark> filteredRows = storeGuyEntry.getValue().stream()
                             .map(x -> salesEscalatedRemarksMap.get(x)).filter(x -> x != null).collect(Collectors.toList());
                     String subject = "Partners escalated to Sales";
                     String messageText = this.getMessageForSalesEscalatedPartners(filteredRows);
             ProfitMandiBusinessException, MessagingException, UnsupportedEncodingException {
         List<NonSdBuying> nonSdByuingActiveList = nonSdBuyingRepository.selectAllActiveNonSDBuyingList(true);
         Map<Integer, NonSdBuying> unAuthorizedBuyingMap = nonSdByuingActiveList.stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
         if (!unAuthorizedBuyingMap.isEmpty()) {
-            for (Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,ProfitMandiConstants.TICKET_CATEGORY_ABM), true).entrySet()) {
+            for (Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_ABM), true).entrySet()) {
                 List<NonSdBuying> unAuthorizedfilteredRows = storeGuyEntry.getValue().stream()
                         .map(x -> unAuthorizedBuyingMap.get(x)).filter(x -> x != null).collect(Collectors.toList());
                 if (!unAuthorizedfilteredRows.isEmpty()) {
                     String subject = "Unauthorized Buying";
                     String messageText = this.getMessageForUnauthorizedBuying(unAuthorizedfilteredRows);
     public void processSidbiDeductions() throws ProfitMandiBusinessException {
         //sidbiService.migrateSanctions();
         sidbiService.processDeductions();
+    }
     public void updatePartnerLimit(int fofoId) throws ProfitMandiBusinessException {
         LocalDateTime firstBillingDate = transactionRepository.getFirstBillingDate(fofoId);
         CreditAccount creditAccount = creditAccountRepository.selectByFofoIdAndGateway(fofoId, Gateway.SDDIRECT);
         BigDecimal utilizationAmount = sdCreditService.getUtilizationAmount(fofoId);
             creditAccount.setFreeDays(sdCreditRequirement.getFreeDays());
             creditAccount.setUpdatedOn(LocalDateTime.now());
+        }
+    }
     public void updatePartnerLimit() throws ProfitMandiBusinessException {
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
         Map<Integer, BigDecimal> fofoSidbiLimitMap = sidbiService.getSuggestedLimitMap();
         Map<Integer, SDCreditRequirement> sdCreditRequirementMap = sdCreditRequirementRepository.selectAll().stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
         Map<Integer, CreditAccount> creditAccountMap = creditAccountRepository.selectAllByGateways(Arrays.asList(Gateway.SIDBI, Gateway.SDDIRECT))
     public void sendDefaultLoanAlert(List<Loan> defaultLoans) throws
             ProfitMandiBusinessException, MessagingException, IOException {
         String subject = "Default Partners";
-        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,ProfitMandiConstants.TICKET_CATEGORY_ABM, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
+        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_ABM, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
         for (Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false).entrySet()) {
             List<Loan> filteredRows = new ArrayList<>();
             for (Loan loan : defaultLoans) {
             sb.append("<td style='border:1px solid black;padding: 5px'>" + new DecimalFormat("#.##").format(Math.abs(amount)) + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + fofoRbmReportingModelMap.get(entry.getFofoId()).getL1Manager() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + fofoRbmReportingModelMap.get(entry.getFofoId()).getL2Manager() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + fofoReportingModelMap.get(entry.getFofoId()).getTerritoryManager() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + fofoReportingModelMap.get(entry.getFofoId()).getRegionalManager() + "</td>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>" + df.format(sdCreditRequirement.getLimit())  + "</td>");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + df.format(sdCreditRequirement.getLimit()) + "</td>");
             sb.append("</tr>");
+        }
         sb.append("</tbody></table></body></html>");
     public void notifyLoanDueDateCross() throws Exception {
         List<Loan> dueDateCrossLoans = sdCreditService.getDueDateCrossLoan();
         List<Loan> allActiveLoans = sdCreditService.getAllActiveLoan();
         if (!dueDateCrossLoans.isEmpty()) {
-            this.sendDueDateCrossLoanAlert(dueDateCrossLoans,allActiveLoans);
+            this.sendDueDateCrossLoanAlert(dueDateCrossLoans, allActiveLoans);
+        }
+    }
-    private void sendDueDateCrossLoanAlert(List<Loan> dueDateCrossLoans,List<Loan> allActiveLoans) throws Exception {
+    private void sendDueDateCrossLoanAlert(List<Loan> dueDateCrossLoans, List<Loan> allActiveLoans) throws Exception {
-        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,ProfitMandiConstants.TICKET_CATEGORY_ABM, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
+        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_ABM, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
         for (Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false).entrySet()) {
             List<Loan> filteredRows = new ArrayList<>();
             for (Loan loan : dueDateCrossLoans) {
+                }
+            }
             ByteArrayOutputStream byteArrayOutputStream = null;
             Utils.Attachment attachment1 = null;
-            if(!filteredAllActiveLoans.isEmpty()){
+            if (!filteredAllActiveLoans.isEmpty()) {
-                 byteArrayOutputStream = this.generateLoanCsv(filteredAllActiveLoans);
+                byteArrayOutputStream = this.generateLoanCsv(filteredAllActiveLoans);
-                 attachment1 = new Utils.Attachment("partnner-credit.csv", new ByteArrayResource(byteArrayOutputStream.toByteArray()));
+                attachment1 = new Utils.Attachment("partnner-credit.csv", new ByteArrayResource(byteArrayOutputStream.toByteArray()));
+            }
             if (!filteredRows.isEmpty()) {
                 String messageText = this.getMessageForDueDateCross(filteredRows);
                 String[] email = new String[]{storeGuyEntry.getKey()};
-                if(attachment1 != null){
+                if (attachment1 != null) {
                     Utils.sendMailWithAttachments(googleMailSender, email, null, null, "Partner Credit Report", messageText, true, attachment1);
-                }else {
+                } else {
-                this.sendMailOfHtmlFormat(googleMailSender, email, messageText, null, "Due Date Cross");
+                    this.sendMailOfHtmlFormat(googleMailSender, email, messageText, null, "Due Date Cross");
-            }
+                }
-        }
+            }
+        }
         String messageText = this.getMessageForDueDateCross(dueDateCrossLoans);
         ByteArrayOutputStream byteArrayOutputStream = this.generateLoanCsv(allActiveLoans);
         Utils.Attachment attachment = null;
-        if(byteArrayOutputStream != null){
+        if (byteArrayOutputStream != null) {
-            attachment  = new Utils.Attachment("partnner-credit.csv", new ByteArrayResource(byteArrayOutputStream.toByteArray()));
+            attachment = new Utils.Attachment("partnner-credit.csv", new ByteArrayResource(byteArrayOutputStream.toByteArray()));
+        }
-        if(attachment != null){
+        if (attachment != null) {
             Utils.sendMailWithAttachments(googleMailSender, new String[]{"sdtech@smartdukaan.com"}, null, null, "Partner Credit Report", messageText, true, attachment);
-        }else {
+        } else {
             this.sendMailOfHtmlFormat(googleMailSender, new String[]{"sdtech@smartdukaan.com"}, messageText, null, "Due Date Cross");
+        }
         if (!dueDateCrossLoans.isEmpty()) {
                         .stream()
                         .collect(Collectors.toList())
         );
         Map<Integer, Map<Integer, Integer>> activatedButNotBilledCatalogQtyMap = smartCartService.activatedButNotBilledCatalogQtyMap();
         LOGGER.info("PartnerOpeningStockByTodayModel {}", partnerOpeningStockByTodayMap);
         for (Map.Entry<Integer, List<PartnerOpeningStockByTodayModel>> entry : partnerOpeningStockByTodayMap.entrySet()) {
             int fofoId = entry.getKey();
             List<PartnerOpeningStockByTodayModel> partnerStockList = entry.getValue();
                 int stockCurrentQty = partnerStock.getOpeningQty();
                 LocalDate openingDate = partnerStock.getOpeningDate();
                 int soldButNotBilledQty = activatedButNotBilledQtyMap.getOrDefault(catalogId, 0);
-                if(catalogId ==1025656 && fofoId == 175140232 ){
+                if (catalogId == 1025656 && fofoId == 175140232) {
-                    LOGGER.info("catalogId {}",catalogId);
+                    LOGGER.info("catalogId {}", catalogId);
-                    LOGGER.info("fofoId {}",fofoId);
+                    LOGGER.info("fofoId {}", fofoId);
-                    LOGGER.info("soldButNotBilledQty {}",soldButNotBilledQty);
+                    LOGGER.info("soldButNotBilledQty {}", soldButNotBilledQty);
-                    LOGGER.info("stockCurrentQty {}",stockCurrentQty);
+                    LOGGER.info("stockCurrentQty {}", stockCurrentQty);
+                }
                 // Subtract soldQty from partnerCurrentQty
                 int partnerCurrentQty = Math.max(stockCurrentQty - soldButNotBilledQty, 0); // Ensure it doesn't go negative

Subversion Repositories SmartDukaan

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