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

 @Component
 @Transactional(rollbackFor = {Throwable.class, ProfitMandiBusinessException.class})
 public class ScheduledTasks {
+    // Lock to serialize all methods that write to sd_credit_requirement table.
+    // Prevents deadlocks and stale-data overwrites from concurrent cron threads.
+    public static final Object SD_CREDIT_LOCK = new Object();
     @Value("${oxigen.recharge.enquiry.url}")
     private String oxigenRechargeEnquiryUrl;
     @Autowired
     PurchaseMigration purchaseMigration;
     @Autowired
     private SanctionRequestRepository sanctionRequestRepository;
     public void calculateInterestAccured() throws ProfitMandiBusinessException {
+        synchronized (SD_CREDIT_LOCK) {
-        List<Loan> loans = loanRepository.selectAllActiveLoan();
+            List<Loan> loans = loanRepository.selectAllActiveLoan();
-        for (Loan loan : loans) {
+            for (Loan loan : loans) {
-            List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(loan.getId());
+                List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(loan.getId());
-            Map<LoanReferenceType, Double> loanStatusAmount = loanStatements.stream().collect(groupingBy(
+                Map<LoanReferenceType, Double> loanStatusAmount = loanStatements.stream().collect(groupingBy(
-                    x -> x.getLoanReferenceType(), Collectors.summingDouble(x -> x.getAmount().doubleValue())));
+                        x -> x.getLoanReferenceType(), Collectors.summingDouble(x -> x.getAmount().doubleValue())));
-            // Interest starts from this date (inclusive). Under current policy (MIN_FREE_DAYS=1),
+                // Interest starts from this date (inclusive). Under current policy (MIN_FREE_DAYS=1),
-            // this is at minimum createdOn + 1 — billing day is always free.
+                // this is at minimum createdOn + 1 — billing day is always free.
-            LocalDate interestStartDate = com.spice.profitmandi.service.transaction.SDCreditServiceImpl.computeInterestStartDate(loan);
+                LocalDate interestStartDate = com.spice.profitmandi.service.transaction.SDCreditServiceImpl.computeInterestStartDate(loan);
-            LOGGER.info("Loan id - {}, interestStartDate {}", loan.getId(), interestStartDate);
+                LOGGER.info("Loan id - {}, interestStartDate {}", loan.getId(), interestStartDate);
-            if (!LocalDate.now().isBefore(interestStartDate)) {
+                if (!LocalDate.now().isBefore(interestStartDate)) {
-                int loanStatementId = loanStatementRepository.selectLatestLoanSatement(loan.getFofoId(), loan.getId());
+                    int loanStatementId = loanStatementRepository.selectLatestLoanSatement(loan.getFofoId(), loan.getId());
-                LOGGER.info("loanStatementId {}", loanStatementId);
+                    LOGGER.info("loanStatementId {}", loanStatementId);
-                if (loanStatementId != 0) {
+                    if (loanStatementId != 0) {
-                    this.calculateInterest(loan, loanStatusAmount, loanStatementId);
+                        this.calculateInterest(loan, loanStatusAmount, loanStatementId);
-                } else {
+                    } else {
-                    sdCreditService.addInterest(interestStartDate, LocalDate.now(), loan, loanStatusAmount);
+                        sdCreditService.addInterest(interestStartDate, LocalDate.now(), loan, loanStatusAmount);
+                    }
+                }
+            }
+        }
+    }
             throw new ProfitMandiBusinessException("loanstament", loanStatement.getLoanId(), "Invalid LoanId");
+        }
+    }
     public void loanSettlement() throws Exception {
+        synchronized (SD_CREDIT_LOCK) {
-        List<Loan> loans = loanRepository.selectAllActiveLoanForSettlement().stream().filter(x -> x.canBeSettled()).collect(toList());
+            List<Loan> loans = loanRepository.selectAllActiveLoanForSettlement().stream().filter(x -> x.canBeSettled()).collect(toList());
-        //TODO:Upto here
+            //TODO:Upto here
-        if (!loans.isEmpty()) {
+            if (!loans.isEmpty()) {
-            for (Loan loan : loans) {
+                for (Loan loan : loans) {
-                LOGGER.info("Loan - {},  {}", loan.getId(), loan.canBeSettled());
+                    LOGGER.info("Loan - {},  {}", loan.getId(), loan.canBeSettled());
-                double settledAmount = sdCreditService.settleLoan(loan);
+                    double settledAmount = sdCreditService.settleLoan(loan);
-                List<SanctionRequest> sanctionRequests = sanctionRequestRepository.selectHoldSanctionByFofoId(loan.getFofoId());
+                    List<SanctionRequest> sanctionRequests = sanctionRequestRepository.selectHoldSanctionByFofoId(loan.getFofoId());
-                for (SanctionRequest sanctionRequest : sanctionRequests) {
+                    for (SanctionRequest sanctionRequest : sanctionRequests) {
+                        List<Order> orders = orderRepository.selectAllByTransactionId(sanctionRequest.getTransactionId());
+                        if (orders.size() == 0) {
+                            LOGGER.info("Could not find orders - for Sanction Request {}", sanctionRequest);
+                            continue;
+                        }
-                    List<Order> orders = orderRepository.selectAllByTransactionId(sanctionRequest.getTransactionId());
+                        if (settledAmount >= sanctionRequest.getPendingAmount().doubleValue()) {
-                    if (orders.size() == 0) {
+                            settledAmount -= sanctionRequest.getPendingAmount().doubleValue();
-                        LOGGER.info("Could not find orders - for Sanction Request {}", sanctionRequest);
+                            sanctionRequest.setPendingAmount(BigDecimal.valueOf(0));
+                            this.sendUnholdEmail(orders);
-                        continue;
+                        } else {
+                            double pendinAmount = sanctionRequest.getPendingAmount().doubleValue() - settledAmount;
+                            System.out.println("Pending Amount - " + pendinAmount);
+                            sanctionRequest.setPendingAmount(BigDecimal.valueOf(pendinAmount));
-                    }
+                            break;
-                    if (settledAmount >= sanctionRequest.getPendingAmount().doubleValue()) {
-                        settledAmount -= sanctionRequest.getPendingAmount().doubleValue();
-                        sanctionRequest.setPendingAmount(BigDecimal.valueOf(0));
-                        this.sendUnholdEmail(orders);
-                    } else {
-                        double pendinAmount = sanctionRequest.getPendingAmount().doubleValue() - settledAmount;
-                        System.out.println("Pending Amount - " + pendinAmount);
-                        sanctionRequest.setPendingAmount(BigDecimal.valueOf(pendinAmount));
-                        break;
+                        }
+                    }
+                }
-            }
+            }
+        }
+    }
     private void sendUnholdEmail(List<Order> orders) throws Exception {
+        }
+    }
     public void updatePartnerLimit() throws ProfitMandiBusinessException {
+        synchronized (SD_CREDIT_LOCK) {
-        Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
+            Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
-        Map<Integer, BigDecimal> fofoSidbiLimitMap = sidbiService.getSuggestedLimitMap();
+            Map<Integer, BigDecimal> fofoSidbiLimitMap = sidbiService.getSuggestedLimitMap();
-        Map<Integer, SDCreditRequirement> sdCreditRequirementMap = sdCreditRequirementRepository.selectAll().stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+            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))
+            Map<Integer, CreditAccount> creditAccountMap = creditAccountRepository.selectAllByGateways(Arrays.asList(Gateway.SIDBI, Gateway.SDDIRECT))
-                .stream().filter(x -> x.isActive()).collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+                    .stream().filter(x -> x.isActive()).collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-        Map<Integer, BulkCreditSummary> bulkSummaryMap = sdCreditService.getCreditSummaryBulk();
+            Map<Integer, BulkCreditSummary> bulkSummaryMap = sdCreditService.getCreditSummaryBulk();
-        for (Entry<Integer, CustomRetailer> customRetailerEntry : customRetailerMap.entrySet()) {
-            int fofoId = customRetailerEntry.getKey();
-            LocalDateTime firstBillingDate = transactionRepository.getFirstBillingDate(fofoId);
-            CreditAccount creditAccount = creditAccountMap.get(fofoId);
-            BulkCreditSummary bulkSummary = bulkSummaryMap.get(fofoId);
-            BigDecimal utilizationAmount = bulkSummary != null ? bulkSummary.getUtilization() : BigDecimal.ZERO;
-            PartnerDailyInvestment partnerDailyInvestment = partnerInvestmentService.getInvestment(fofoId, 0);
-            BigDecimal suggestedAmount = this.getSuggestedAmount(creditAccount, partnerDailyInvestment, utilizationAmount, fofoSidbiLimitMap.get(fofoId));
-            SDCreditRequirement sdCreditRequirement = sdCreditRequirementMap.get(fofoId);
-            LOGGER.info("suggestedAmount {} ", suggestedAmount);
-            if (sdCreditRequirement == null) {
-                sdCreditRequirement = new SDCreditRequirement();
-                sdCreditRequirement.setFofoId(fofoId);
-                sdCreditRequirement.setCreditDays(15);
-                sdCreditRequirement.setInterestRate(ProfitMandiConstants.NEW_INTEREST_RATE);
-                sdCreditRequirement.setRisk(CreditRisk.HIGH_RISK);
-                sdCreditRequirement.setUtilizedAmount(BigDecimal.ZERO);
-                sdCreditRequirement.setCreateTimestamp(LocalDateTime.now());
-                sdCreditRequirement.setUpdateTimestamp(LocalDateTime.now());
-                sdCreditRequirementRepository.persist(sdCreditRequirement);
-            }
+            // Sort by fofoId to ensure deterministic row-locking order and prevent deadlocks
-            CreditRisk creditRisk = sdCreditService.getCurrentRisk(sdCreditRequirement, firstBillingDate);
+            List<Integer> sortedFofoIds = customRetailerMap.keySet().stream().sorted().collect(Collectors.toList());
-            sdCreditRequirement.setRisk(creditRisk);
+            for (int fofoId : sortedFofoIds) {
+                CustomRetailer customRetailer = customRetailerMap.get(fofoId);
+                LocalDateTime firstBillingDate = transactionRepository.getFirstBillingDate(fofoId);
-            sdCreditRequirement.setSuggestedLimit(suggestedAmount);
+                CreditAccount creditAccount = creditAccountMap.get(fofoId);
-            if (!sdCreditRequirement.isHardLimit()) {
+                BulkCreditSummary bulkSummary = bulkSummaryMap.get(fofoId);
+                BigDecimal utilizationAmount = bulkSummary != null ? bulkSummary.getUtilization() : BigDecimal.ZERO;
+                PartnerDailyInvestment partnerDailyInvestment = partnerInvestmentService.getInvestment(fofoId, 0);
+                BigDecimal suggestedAmount = this.getSuggestedAmount(creditAccount, partnerDailyInvestment, utilizationAmount, fofoSidbiLimitMap.get(fofoId));
-                sdCreditRequirement.setLimit(suggestedAmount);
+                SDCreditRequirement sdCreditRequirement = sdCreditRequirementMap.get(fofoId);
-            }
-            BigDecimal availableLimit = sdCreditRequirement.getLimit().subtract(utilizationAmount);
+                LOGGER.info("suggestedAmount {} ", suggestedAmount);
+                if (sdCreditRequirement == null) {
-            LOGGER.info("utilizedLimit {} ", utilizationAmount);
+                    sdCreditRequirement = new SDCreditRequirement();
+                    sdCreditRequirement.setFofoId(fofoId);
+                    sdCreditRequirement.setCreditDays(15);
+                    sdCreditRequirement.setInterestRate(ProfitMandiConstants.NEW_INTEREST_RATE);
+                    sdCreditRequirement.setRisk(CreditRisk.HIGH_RISK);
+                    sdCreditRequirement.setUtilizedAmount(BigDecimal.ZERO);
+                    sdCreditRequirement.setCreateTimestamp(LocalDateTime.now());
+                    sdCreditRequirement.setUpdateTimestamp(LocalDateTime.now());
+                    sdCreditRequirementRepository.persist(sdCreditRequirement);
+                }
-            LOGGER.info("availableLimit {} ", availableLimit);
+                CreditRisk creditRisk = sdCreditService.getCurrentRisk(sdCreditRequirement, firstBillingDate);
-            sdCreditRequirement.setUtilizedAmount(utilizationAmount);
+                sdCreditRequirement.setRisk(creditRisk);
-            sdCreditRequirement.setUpdateTimestamp(LocalDateTime.now());
+                sdCreditRequirement.setSuggestedLimit(suggestedAmount);
+                if (!sdCreditRequirement.isHardLimit()) {
+                    sdCreditRequirement.setLimit(suggestedAmount);
+                }
-            if (creditAccount != null) {
+                BigDecimal availableLimit = sdCreditRequirement.getLimit().subtract(utilizationAmount);
-                creditAccount.setInterestRate(sdCreditRequirement.getInterestRate().floatValue());
-                creditAccount.setSanctionedAmount(sdCreditRequirement.getLimit().floatValue());
+                LOGGER.info("utilizedLimit {} ", utilizationAmount);
-                creditAccount.setAvailableAmount(availableLimit.floatValue());
+                LOGGER.info("availableLimit {} ", availableLimit);
-                creditAccount.setFreeDays(sdCreditRequirement.getFreeDays());
+                sdCreditRequirement.setUtilizedAmount(utilizationAmount);
-                creditAccount.setUpdatedOn(LocalDateTime.now());
+                sdCreditRequirement.setUpdateTimestamp(LocalDateTime.now());
-            }
+                if (creditAccount != null) {
+                    creditAccount.setInterestRate(sdCreditRequirement.getInterestRate().floatValue());
+                    creditAccount.setSanctionedAmount(sdCreditRequirement.getLimit().floatValue());
+                    creditAccount.setAvailableAmount(availableLimit.floatValue());
+                    creditAccount.setFreeDays(sdCreditRequirement.getFreeDays());
+                    creditAccount.setUpdatedOn(LocalDateTime.now());
+                }
+            }
+        }
+    }
     private static final NavigableMap<Double, Double> discountMap = new TreeMap<>();
+        }
         return suggestedAmount;
+    }
     public void notifyDefaultLoans() throws ProfitMandiBusinessException, MessagingException, IOException {
+        synchronized (SD_CREDIT_LOCK) {
-        sdCreditService.updateRisk();
+            sdCreditService.updateRisk();
-        List<Loan> defaultLoans = sdCreditService.getDefaultLoans();
+            List<Loan> defaultLoans = sdCreditService.getDefaultLoans();
-        if (!defaultLoans.isEmpty()) {
+            if (!defaultLoans.isEmpty()) {
-            this.sendDefaultLoanAlert(defaultLoans);
+                this.sendDefaultLoanAlert(defaultLoans);
+            }
+        }
+    }
     public void sendDefaultLoanAlert(List<Loan> defaultLoans) throws
             ProfitMandiBusinessException, MessagingException, IOException {
         String subject = "Default Partners";
+        }
+    }
     public void sendMailWhatsAppAfterLoanDueDate() throws Exception {
+        synchronized (SD_CREDIT_LOCK) {
-        sdCreditService.updateRisk();
+            sdCreditService.updateRisk();
-        List<Loan> defaultLoans = sdCreditService.getDefaultLoans();
+            List<Loan> defaultLoans = sdCreditService.getDefaultLoans();
-        if (!defaultLoans.isEmpty()) {
+            if (!defaultLoans.isEmpty()) {
-            this.sendLoanAlert(defaultLoans);
+                this.sendLoanAlert(defaultLoans);
+            }
+        }
+    }
     public void sendLoanAlert(List<Loan> defaultLoans) throws
             Exception {

Subversion Repositories SmartDukaan

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