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

     @Autowired
     LoanTransactionRepository loanTransactionRepository;
     private void fixBlockedCredit() throws ProfitMandiBusinessException {
-        List<Loan> unsettledBlockedLoans = loanRepository.selectAllActiveLoan().stream().filter(Loan::isLimit).collect(toList());
+        List<Loan> unsettledBlockedLoans = loanRepository.selectAllBlockedLoans();
         //unsettledBlockedLoans = unsettledBlockedLoans.stream().filter(x -> x.getId() == 52310).collect(toList());
         for (Loan unsettledBlockedLoan : unsettledBlockedLoans) {
             LoanTransaction loanTransaction = loanTransactionRepository.selectByLoanId(unsettledBlockedLoan.getId());
             if (loanTransaction == null) {
                 System.out.println("Cant find Transaction Id for Loan - " + unsettledBlockedLoan.getId() + "-- Created On ->" + unsettledBlockedLoan.getCreatedOn());
     public void dailyLoanAlert() throws Exception {
         List<Loan> loans = loanRepository.selectAllActiveLoan();
         Map<Integer, Double> partnerLoanAmount = new HashMap<>();
-        if (!loans.isEmpty()) {
-            for (Loan loan : loans) {
+        for (Loan loan : loans) {
-                List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(loan.getId());
-                double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
-                if (partnerLoanAmount.get(loan.getFofoId()) != null) {
-                    amount += partnerLoanAmount.get(loan.getFofoId());
+            double amount = partnerLoanAmount.getOrDefault(loan.getFofoId(), 0.0);
-                    partnerLoanAmount.put(loan.getFofoId(), amount);
+            amount += loan.getPendingAmount().doubleValue() + loan.getInterestAccrued().doubleValue() - loan.getInterestPaid().doubleValue();
-                } else {
-                    partnerLoanAmount.put(loan.getFofoId(), amount);
+            partnerLoanAmount.put(loan.getFofoId(), amount);
-                }
-            }
+        }
         if (!partnerLoanAmount.isEmpty()) {
             for (Entry<Integer, Double> partnerLoanAmountEnrty : partnerLoanAmount.entrySet()) {
+        }
         String messageText = this.getMessageForDueDateExtend(defaultLoans);
         this.sendMailOfHtmlFormat(googleMailSender, new String[]{"puneet.wahi@smartdukaan.com", "rahul.latwal@smartdukaan.com", "dilbag.singh@smartdukaan.com"}, messageText, null, subject);
         for (Loan defaultLoan : defaultLoans) {
-            List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(defaultLoan.getId());
+            double principal = defaultLoan.getPendingAmount().doubleValue();
-            double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
+            double interest = defaultLoan.getInterestAccrued().doubleValue() - defaultLoan.getInterestPaid().doubleValue();
+            double total = principal + interest;
-            com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(defaultLoan.getFofoId());
-            Address address = addressRepository.selectById(user.getAddressId());
-            String title = "Outstanding Credit Payment Overdue!";
+            String title = "Credit Default Alert!";
             String url = "http://app.smartdukaan.com/pages/home/credit";
-            String message = "Your Outstanding Credit payment due date " + defaultLoan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + " has been exceeded. Please note " + ProfitMandiConstants.NEW_DELAYED_INTEREST_RATE + " shall be levied on daily basis." + " Your total pending Loan amount is Rs." + FormattingUtils.formatDecimal(Math.abs(amount)) + ". !!Pay Now!!";
+            String message = "Your credit payment (due " + defaultLoan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + ") is now in default. A penalty interest of " + ProfitMandiConstants.NEW_DELAYED_INTEREST_RATE + "% per day is being charged. Total outstanding: Rs." + FormattingUtils.formatDecimal(total) + " (Principal: Rs." + FormattingUtils.formatDecimal(principal) + " + Interest: Rs." + FormattingUtils.formatDecimal(interest) + "). Pay immediately to avoid further penalties.";
             notificationService.sendNotification(defaultLoan.getFofoId(), title, MessageType.notification, title, message, url);
-            // notificationService.sendWhatsappMessage(message, title,
-            // address.getPhoneNumber());
+        }
+    }
     private String getMessageForDueDateExtend(List<Loan> loans) throws ProfitMandiBusinessException {
         Map<Integer, com.spice.profitmandi.dao.model.FofoReportingModel> fofoReportingModelMap = csService.getPartnerIdSalesHeaders();
         List<AST> asts = astRepository.selectAll();
         Map<Integer, AST> astMap = asts.stream()
                 .collect(Collectors.toMap(AST::getId, ast -> ast));
         StringBuilder sb = new StringBuilder();
         sb.append(
-                "<html><body><p>Alert</p><p>Default Partners :-</p>" + "<br/><p>EveryDay Rs.100 charged as Penalty</p>" + "<br/>" +
+                "<html><body><p>Alert</p><p>Default Partners :-</p>" + "<br/><p>Penalty interest of " + ProfitMandiConstants.NEW_DELAYED_INTEREST_RATE + "% per day is being charged on outstanding amount.</p>" + "<br/>" +
                         "<table style='border:1px solid black ;padding: 5px';>");
         sb.append("<tbody>\n" +
                 "<tr>\n" +
                 "<th style='border:1px solid black;padding: 5px'>PartnerName</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>State Name</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>RBM L2</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>RBM L1</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>Sales L1</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>Sales L2</th>\n" +
                 "</tr>");
+        DecimalFormat df = new DecimalFormat("#.##");
         for (Loan entry : loans) {
-            List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(entry.getId());
-            double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
+            double amount = entry.getPendingAmount().doubleValue() + entry.getInterestAccrued().doubleValue() - entry.getInterestPaid().doubleValue();
             long noOfdaysBetween = ChronoUnit.DAYS.between(entry.getDueDate().toLocalDate(), LocalDateTime.now());
             CustomRetailer customRetailer = retailerService.getFofoRetailer(entry.getFofoId());
             sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getAddress().getState() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + astMap.get(customRetailer.getAstId()).getArea() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + astMap.get(customRetailer.getAstId()).getTerritory() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + entry.getDueDate().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + noOfdaysBetween + "</td>");
-            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'>" + df.format(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("</tr>");
+        }
         sb.append("</tbody></table></body></html>");
         List<AST> asts = astRepository.selectAll();
         Map<Integer, AST> astMap = asts.stream()
                 .collect(Collectors.toMap(AST::getId, ast -> ast));
         StringBuilder sb = new StringBuilder();
-        sb.append("<html><body><p>Alert</p><p>Partner Credit Report :-</p>" + "<br/><p>Additional penal interest of  shall be levied on daily basis.</p>" + "<br/>" +
+        sb.append("<html><body><p>Alert</p><p>Partner Credit Report - Overdue :-</p>" + "<br/><p>Overdue interest of " + ProfitMandiConstants.TIER2_INTEREST_RATE + "% per day is being charged on outstanding amount.</p>" + "<br/>" +
                 "<table style='border:1px solid black ;padding: 5px';>");
         sb.append("<tbody>\n" + "<tr>\n" +
                 "<th style='border:1px solid black;padding: 5px'>PartnerName</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>State Name</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>Area</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>Sales L1</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>Sales L2</th>\n" +
                 "<th style='border:1px solid black;padding: 5px'>Limit Assigned</th>\n" +
                 "</tr>");
+        DecimalFormat df = new DecimalFormat("#.##");
         for (Loan entry : dueDateCrossLoans) {
-            DecimalFormat df = new DecimalFormat("#.##");
-            List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(entry.getId());
-            double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
+            double amount = entry.getPendingAmount().doubleValue() + entry.getInterestAccrued().doubleValue() - entry.getInterestPaid().doubleValue();
             long noOfdaysBetween = ChronoUnit.DAYS.between(entry.getDueDate().toLocalDate(), LocalDateTime.now());
             CustomRetailer customRetailer = retailerService.getFofoRetailer(entry.getFofoId());
             sb.append("<tr>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getBusinessName() + "(" + customRetailer.getCode() + ")" + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getAddress().getState() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + astMap.get(customRetailer.getAstId()).getArea() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + astMap.get(customRetailer.getAstId()).getTerritory() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + entry.getDueDate().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + noOfdaysBetween + "</td>");
-            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'>" + df.format(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>");
+        }
         if (!dueDateCrossLoans.isEmpty()) {
             for (Loan loan : dueDateCrossLoans) {
-                long noOfdaysBetween = ChronoUnit.DAYS.between(loan.getDueDate().toLocalDate(), LocalDate.now());
+                double principal = loan.getPendingAmount().doubleValue();
-                com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(loan.getFofoId());
-                Address address = addressRepository.selectById(user.getAddressId());
+                double interest = loan.getInterestAccrued().doubleValue() - loan.getInterestPaid().doubleValue();
-                LOGGER.info("noOfdaysBetween {} ", noOfdaysBetween);
+                double total = principal + interest;
-                List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(loan.getId());
-                double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
                 String url = "http://app.smartdukaan.com/pages/home/credit";
-                String title = "Alert!";
+                String title = "Credit Payment Overdue!";
-                String message = "Your Outstanding Credit Payment due date " + loan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + " has been exceeded. Additional penal interest of " + loan.getInterestRate().setScale(2, RoundingMode.HALF_UP) + "% shall be levied on daily basis. Your total pending loan amount is Rs." + FormattingUtils.formatDecimal(Math.abs(amount)) + ". !!Pay Now!!";
+                String message = "Your credit payment (due " + loan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + ") is overdue. An interest of " + ProfitMandiConstants.TIER2_INTEREST_RATE + "% per day is now being charged. Total outstanding: Rs." + FormattingUtils.formatDecimal(total) + " (Principal: Rs." + FormattingUtils.formatDecimal(principal) + " + Interest: Rs." + FormattingUtils.formatDecimal(interest) + "). Pay now to avoid higher penalties.";
                 notificationService.sendNotification(loan.getFofoId(), title, MessageType.notification, title, message, url);
-                //notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
+            }
+        }
+    }
                         "RBM L2", "RBM L1", "Sales L1", "Sales L2", "Limit Assigned"
                 );
                 List<List<?>> rows = new ArrayList<>();
+                DecimalFormat df = new DecimalFormat("#.##");
                 for (Loan entry : loans) {
-                    List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(entry.getId());
-                    double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
+                    double amount = entry.getPendingAmount().doubleValue() + entry.getInterestAccrued().doubleValue() - entry.getInterestPaid().doubleValue();
-//                    long noOfdaysBetween = ChronoUnit.DAYS.between(entry.getDueDate().toLocalDate(), LocalDateTime.now());
                     long noOfdaysBetween = ChronoUnit.DAYS.between(entry.getCreatedOn().toLocalDate(), LocalDateTime.now());
                     CustomRetailer customRetailer = retailerService.getFofoRetailer(entry.getFofoId());
                     SDCreditRequirement sdCreditRequirement = sdCreditRequirementRepository.selectByFofoId(customRetailer.getPartnerId());
-                    DecimalFormat df = new DecimalFormat("#.##");
                     List<String> row = Arrays.asList(
                             customRetailer.getBusinessName() + "(" + customRetailer.getCode() + ")",
                             customRetailer.getAddress().getState(),
                             astMap.get(customRetailer.getAstId()).getArea(),
                             astMap.get(customRetailer.getAstId()).getTerritory(),
                             entry.getDueDate().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")),
                             String.valueOf(noOfdaysBetween),
-                            df.format(Math.abs(amount)),
+                            df.format(amount),
                             fofoRbmReportingModelMap.get(entry.getFofoId()).getL1Manager(),
                             fofoRbmReportingModelMap.get(entry.getFofoId()).getL2Manager(),
                             fofoReportingModelMap.get(entry.getFofoId()).getTerritoryManager(),
                             fofoReportingModelMap.get(entry.getFofoId()).getRegionalManager(),
                             df.format(sdCreditRequirement.getLimit())
     public void alertForDueDate() throws Exception {
         List<Loan> loans = loanRepository.selectAllActiveLoan();
-        if (!loans.isEmpty()) {
-            for (Loan loan : loans) {
+        for (Loan loan : loans) {
-                com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(loan.getFofoId());
-                Address address = addressRepository.selectById(user.getAddressId());
-                long noOfdaysBetween = ChronoUnit.DAYS.between(LocalDate.now(), loan.getDueDate().toLocalDate());
+            long noOfdaysBetween = ChronoUnit.DAYS.between(LocalDate.now(), loan.getDueDate().toLocalDate());
-                LOGGER.info("noOfdaysBetween {} ", noOfdaysBetween);
-                if (noOfdaysBetween <= 4 && noOfdaysBetween >= 0) {
-                    List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(loan.getId());
-                    double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
-                    String title = "Alert!";
-                    String url = "http://app.smartdukaan.com/pages/home/credit";
-                    String message = null;
-                    if (noOfdaysBetween == 0) {
-                        message = "Your total outstanding Credit amount is Rs." + FormattingUtils.formatDecimal(Math.abs(amount)) + " is due for Today, Pay Now!!";
-                    } else {
-                        message = "Your total outstanding Credit amount is Rs." + FormattingUtils.formatDecimal(Math.abs(amount)) + " is due by " + loan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + " , Pay Now!!";
+            LOGGER.info("noOfdaysBetween {} ", noOfdaysBetween);
-                    }
+            if (noOfdaysBetween <= 4 && noOfdaysBetween >= 0) {
-                    notificationService.sendNotification(loan.getFofoId(), title, MessageType.notification, title, message, url);
+                double amount = loan.getPendingAmount().doubleValue() + loan.getInterestAccrued().doubleValue() - loan.getInterestPaid().doubleValue();
-                    //notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
+                String title = "Alert!";
+                String url = "http://app.smartdukaan.com/pages/home/credit";
+                String message;
+                if (noOfdaysBetween == 0) {
+                    message = "Your total outstanding Credit amount is Rs." + FormattingUtils.formatDecimal(amount) + " is due for Today, Pay Now!!";
+                } else {
+                    message = "Your total outstanding Credit amount is Rs." + FormattingUtils.formatDecimal(amount) + " is due by " + loan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + " , Pay Now!!";
+                }
+                notificationService.sendNotification(loan.getFofoId(), title, MessageType.notification, title, message, url);
+            }
+        }
+    }
+    }
     public void sendLoanAlert(List<Loan> defaultLoans) 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);
-        /*for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false).entrySet()) {
-            List<Loan> filteredRows = defaultLoans.stream()
+        // Sort by lowest dueDate first (most overdue)
-                    .filter(loan -> storeGuyEntry.getValue().contains(loan.getFofoId()))
+        defaultLoans.sort(Comparator.comparing(Loan::getDueDate));
-                    .collect(Collectors.toList());
-            if (!filteredRows.isEmpty()) {
-                for (Loan defaultLoan : filteredRows) {
-                    List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(defaultLoan.getId());
-                    double amount = loanStatements.stream().map(LoanStatement::getAmount).collect(Collectors.summingDouble(BigDecimal::doubleValue));
-                    String messageText = getMessageForDueDateExtend(defaultLoan,amount);
-                   // String[] email = new String[]{storeGuyEntry.getKey()};
-                    sendMailOfHtmlFormat(mailSender, email, messageText, null, subject);
-                }
-            }
-        }*/
-        //Send single whatsapp to tv
         String title = "SD Credit Alert!";
-        boolean notYetSent = true;
+        int whatsAppCount = 0;
         for (Loan defaultLoan : defaultLoans) {
-            List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(defaultLoan.getId());
+            double principal = defaultLoan.getPendingAmount().doubleValue();
-            double amount = loanStatements.stream().map(LoanStatement::getAmount).collect(Collectors.summingDouble(BigDecimal::doubleValue));
+            double interest = defaultLoan.getInterestAccrued().doubleValue() - defaultLoan.getInterestPaid().doubleValue();
+            double total = principal + interest;
             com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(defaultLoan.getFofoId());
             Address address = addressRepository.selectById(user.getAddressId());
-            //String url = "http://app.smartdukaan.com/pages/home/credit";
+            // WhatsApp: only top 2 most overdue loans
-            String message = getMessageForDueDateExtend(defaultLoan, amount);
+            if (whatsAppCount < 2) {
-            String whatsAppMessage = getWhatsAppMessageForDueDateExtend(defaultLoan, amount);
+                String whatsAppMessage = getWhatsAppMessageForDefaultLoan(defaultLoan, total, user.getName());
-            if (whatsAppMessage != null) {
                 notificationService.sendWhatsappMessage(whatsAppMessage, title, address.getPhoneNumber());
-                if (notYetSent) {
+                whatsAppCount++;
-                    notificationService.sendWhatsappMessage(whatsAppMessage, title, "9911565032");
-                    notYetSent = false;
-                }
+            }
+            String emailMessage = getEmailMessageForDefaultLoan(defaultLoan, principal, interest, total, user.getName());
             String[] email = {user.getEmailId()};
-            sendMailOfHtmlFormat(mailSender, email, message, null, "Loan Alert - SmartDukaan");
+            sendMailOfHtmlFormat(mailSender, email, emailMessage, null, "Loan Alert - SmartDukaan");
+        }
+    }
-    private String getMessageForDueDateExtend(Loan defaultLoan, double amount) throws ProfitMandiBusinessException {
+    private String getEmailMessageForDefaultLoan(Loan loan, double principal, double interest, double total, String name) {
-        double absoluteAmount = Math.abs(amount);
-        long roundedAmount = Math.round(absoluteAmount);
+        String formattedTotal = FormattingUtils.formatDecimal(total);
-        String formattedAmount = (amount < 0) ? "" + roundedAmount : "" + roundedAmount;
+        String formattedPrincipal = FormattingUtils.formatDecimal(principal);
-        LocalDate dueDate = defaultLoan.getDueDate().toLocalDate();
+        String formattedInterest = FormattingUtils.formatDecimal(interest);
-        LocalDate defaultDate = defaultLoan.getDueDate().toLocalDate().plusDays(15);
+        long daysInDefault = ChronoUnit.DAYS.between(loan.getPenaltyDate(), LocalDate.now());
-        // Retrieve the name of the user associated with the loan
-        String name = userUserRepository.selectById(defaultLoan.getFofoId()).getName();
-        // Initialize a StringBuilder to construct the HTML message
         StringBuilder sb = new StringBuilder();
-        if (LocalDate.now().isBefore(dueDate)) {
-            long noOfdaysBetween = ChronoUnit.DAYS.between(LocalDate.now(), defaultLoan.getDueDate().toLocalDate());
-            String payDate = defaultLoan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy"));
-            // 5 Days Before Due Date - daily
-            if (noOfdaysBetween <= 5) {
+        sb.append("<html><body>");
-                sb.append("<html><body><p><b>Loan Repayment Alert !</b></p></br><p>Dear " + name + "</p>");
-                sb.append("<p>This is a friendly reminder that your loan payment is due in " + noOfdaysBetween + "days, on " +
-                        payDate +
-                        ". Please ensure that the payment is made on time to avoid any late fees or penalties.</p>");
-                sb.append("<p>As per the terms of your loan agreement, the total amount due is Rs. " + formattedAmount + ". " +
-                        "You can make the payment by adding money to your wallet. If you have any questions or need assistance, " +
-                        "our customer service team is available to help you.</p>");
-                sb.append("<p>Thank you for your cooperation and prompt attention to this matter.</p></br><p> Smart Dukaan Team !!</p>");
-            }
-        } else if (LocalDate.now().isBefore(defaultDate)) {
-            long noOfdaysBetween = ChronoUnit.DAYS.between(defaultDate, LocalDate.now());
-            // After Due Date – Alternate days
-            if ((noOfdaysBetween % 2 == 0) && (noOfdaysBetween > 5)) {
-                sb.append("<html><body><p><b>Loan Repayment Alert !</b></p></br><p>Dear " + name + "</p>");
-                sb.append("<p>We would like to remind you that your payment for the outstanding balance on your account is now overdue. " +
-                        "As per our terms and conditions, a higher interest rate will be levied on the overdue amount Rs. " + formattedAmount + ".</p>");
-                sb.append("<p>To avoid further charges and any negative impact on your Credit score, we kindly request that you settle the " +
-                        "outstanding balance as soon as possible.</p>");
-                sb.append("<p>Thank you for your attention to this matter.</p></br><p> Smart Dukaan Team !!</p>");
-            }
-            // 5 Days before default - daily
-            if (noOfdaysBetween <= 5) {
-                sb.append("<html><body><p><b>Loan Repayment Alert !</b></p></br>");
+        sb.append("<p><b>Credit Default Alert!</b></p><br/>");
-                sb.append("<p>Attention: High Alert</p>");
-                sb.append("<p>Dear " + name + "</p>");
+        sb.append("<p>Dear " + name + ",</p>");
-                sb.append("<p>This is to inform you that the due date for your payment of Rs. " + formattedAmount + " has been crossed, " +
-                        "and you are approaching the default date on " + defaultDate.format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + ". " +
-                        "Please be aware that this will have a significant impact on your Credit score and may result in substantial penalties as well.</p>");
-                sb.append("<p>To rectify this situation, it is imperative that you take immediate action. " +
+        sb.append("<p>Your credit payment has been in default for " + daysInDefault + " days. " +
-                        "Please make the necessary payment immediately to avoid further consequences.</p>");
+                "A penalty interest of " + ProfitMandiConstants.NEW_DELAYED_INTEREST_RATE + "% per day is being charged.</p>");
-                sb.append("<p>Thank you for your attention to this matter.</p></br><p> Smart Dukaan Team !!</p>");
+        sb.append("<p><b>Total Outstanding: Rs. " + formattedTotal + "</b><br/>");
-            }
-        } else {
-            // Post Default - Daily
-            sb.append("<html><body><p><b>Loan Repayment Alert !</b></p></br><p>Dear " + name + "</p>");
+        sb.append("Principal: Rs. " + formattedPrincipal + "<br/>");
-            sb.append("<p>We regret to inform you that you are currently in loan default. As a result, " +
+        sb.append("Interest: Rs. " + formattedInterest + "</p>");
-                    "higher penalties are being charged, which is also negatively impacting your Credit score. " +
-                    "It is imperative that you make an immediate payment to rectify this situation.</p>");
-            sb.append("<p>Please note that failing to make the payment promptly will result in further consequences, " +
+        sb.append("<p>Continued default will impact your Credit score and may result in legal action. " +
-                    "including potential legal action and additional financial penalties. " +
-                    "We strongly urge you to take this matter seriously and settle the outstanding amount as soon as possible.</p>");
+                "Please settle the outstanding amount immediately.</p>");
-            sb.append("<p>To make the payment, please add Rs. " + formattedAmount + " to your wallet. We are here to help you resolve this issue and get back on track.</p>");
+        sb.append("<p>To make the payment, please add Rs. " + formattedTotal + " to your wallet.</p>");
-            sb.append("<p>Thank you for your attention to this matter.</p></br><p> Smart Dukaan Team !!</p>");
-        }
-        // Return the constructed HTML message
+        sb.append("<p>Team SmartDukaan</p>");
         sb.append("</body></html>");
         return sb.toString();
+    }
-    private String getWhatsAppMessageForDueDateExtend(Loan defaultLoan, double amount) throws
+    private String getWhatsAppMessageForDefaultLoan(Loan loan, double total, String name) {
-            ProfitMandiBusinessException {
-        double absoluteAmount = Math.abs(amount);
-        long roundedAmount = Math.round(absoluteAmount);
+        String formattedAmount = FormattingUtils.formatDecimal(total);
-        String formattedAmount = (amount < 0) ? "" + roundedAmount : "" + roundedAmount;
-        LocalDate dueDate = defaultLoan.getDueDate().toLocalDate();
-        LocalDate defaultDate = defaultLoan.getDueDate().toLocalDate().plusDays(15);
-        // Retrieve the name of the user associated with the loan
-        String name = userUserRepository.selectById(defaultLoan.getFofoId()).getName();
-        // Initialize a StringBuilder to construct the HTML message
-        String message = null;
-        if (LocalDate.now().isBefore(dueDate)) {
-            long noOfdaysBetween = ChronoUnit.DAYS.between(LocalDate.now(), defaultLoan.getDueDate().toLocalDate());
+        long daysInDefault = ChronoUnit.DAYS.between(loan.getPenaltyDate(), LocalDate.now());
-            String payDate = defaultLoan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy"));
-            // 5 Days Before Due Date - daily
-            if (noOfdaysBetween <= 5) {
-                message = "Dear %s, This is a friendly reminder that your outstanding credit payment is due in %d days, on %s.\n" +
-                        "\n" +
-                        "Please ensure that the payment is made on time to avoid any late fees or penalties.As per the terms of your loan agreement, the total amount due is Rs. %s. You can make the payment by adding money to wallet.\n" +
-                        "\n" +
+        return String.format(
-                        "If you have any questions or need assistance, our customer service team is available to help you.\n" +
-                        "Thank you for your cooperation and prompt attention to this matter.\n" +
+                "Dear %s, Your credit payment has been in default for %d days. " +
-                        "\n" +
-                        "Team SmartDukaan";
-                message = String.format(message, name, noOfdaysBetween, payDate, formattedAmount);
-            }
-        } else if (LocalDate.now().isBefore(defaultDate)) {
-            long noOfdaysBetween = ChronoUnit.DAYS.between(defaultDate, LocalDate.now());
-            // After Due Date – Alternate days
-            if ((noOfdaysBetween % 2 == 0) && (noOfdaysBetween > 5)) {
-                message = "Dear %s, We would like to remind you that your payment for the outstanding balance on your account is now overdue. \n" +
-                        "As per our terms and conditions, a higher interest rate will be levied on the overdue amount Rs.%s.\n" +
+                "A penalty interest of %s%% per day is being charged on your outstanding amount of Rs. %s. " +
-                        "To avoid further charges and any negative impact on your Credit ratings, we kindly request that you settle the outstanding balance as soon as possible.\n" +
-                        "Thank you for your attention to this matter. \n" +
+                "Please settle immediately to avoid legal action.\n\nTeam SmartDukaan",
-                        "\n" +
-                        "Team SmartDukaan";
-                message = String.format(message, name, formattedAmount);
+                name, daysInDefault, ProfitMandiConstants.NEW_DELAYED_INTEREST_RATE, formattedAmount);
-            }
-            // 5 Days before default - daily
-            if (noOfdaysBetween <= 5) {
-                String defaultPayDate = defaultDate.format(DateTimeFormatter.ofPattern("dd-MM-yyyy"));
-                message = "Attention: High Alert!! Dear %s, \n" +
-                        "\n" +
-                        "This is to inform you that the due date for your payment of Rs. %s has been crossed, and as a result, you are now about to reach default date %s.\n" +
-                        "Please be aware that this will have a significant impact on your Credit score and may result in substantial penalties as well. To rectify this situation, it is imperative that you take immediate action.\n" +
-                        "\n" +
-                        "Please make the necessary payment immediately to avoid further consequences. Thank you for your attention to this matter.\n" +
-                        "\n" +
-                        "Team SmartDukaan";
-                message = String.format(message, name, formattedAmount, defaultPayDate);
-            }
-        } else {
-            // Post Default - Daily
-            message = "Dear %s, We regret to inform you that you are currently in Credit default. As a result, higher penalties are being charged, which is also negatively impacting your Credit score. \n" +
-                    "\n" +
-                    "It is imperative that you make an immediate payment to rectify this situation. \n" +
-                    "\n" +
-                    "Please note that failing to make the payment promptly will result in further consequences, including potential legal action and additional financial penalties. \n" +
-                    "\n" +
-                    "We strongly urge you to take this matter seriously and settle the outstanding amount as soon as possible. \n" +
-                    "\n" +
-                    "To make the payment, please add Rs. %s  to wallet. We are here to help you resolve this issue and get back on track. Thank you for your attention to this matter. \n" +
-                    "\n" +
-                    "Team SmartDukaan";
-            message = String.format(message, name, formattedAmount);
-        }
-        // Return the constructed HTML message
-        return message;
+    }
     @Autowired
     private FofoOpeningStockRepository fofoOpeningStockRepository;
     @Autowired

Subversion Repositories SmartDukaan

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