Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

sen

2025-09-01 4f7d8924b8c5f4f019b16a8563e30c48abef441e

 quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java

@@ -48,9 +48,14 @@

        List<EstimatedReceivable> estimatedReceivables = new ArrayList<>();
        for (PendingSettlementBusiness pendingSettlementBusiness : pendingSettlementBusinesses) {
            pendingSettlementBusiness.setIsCreate(0);
            pendingSettlementBusiness.setEstimatedTotalCost(BigDecimal.ZERO);

            pendingSettlementBusiness.setEstimatedTotalIncome(BigDecimal.ZERO);
            ReceivableLineTruckPriceRule exactMatchingRule = ExactPricingRuleMatcher.findExactMatchingRule(receivableLineTruckPriceRules, pendingSettlementBusiness.getCustomerName(), pendingSettlementBusiness.getDepartureLocation(), pendingSettlementBusiness.getArrivalLocation(), pendingSettlementBusiness.getVehicleType());
            if (exactMatchingRule!=null) {
                //应收数据
                pendingSettlementBusiness.setIsIncomeMatched(1);
                pendingSettlementBusiness.setEstimatedTotalIncome(exactMatchingRule.getFreight());
                pendingSettlementBusiness.setCreateTime(date);
                EstimatedReceivable estimatedReceivable = new EstimatedReceivable();
@@ -64,10 +69,12 @@
                estimatedReceivable.setCurrency("人民币");
                estimatedReceivable.setIsConfirmed(1);
                estimatedReceivable.setFeeType(0);
                estimatedReceivable.setRelatedBillStatus(0);
                estimatedReceivables.add(estimatedReceivable);
            }
            ReceivableLineTruckPriceRule exactMatchingRule2 = ExactPricingRuleMatcher.findExactMatchingRule(payableLineTruckPriceRules, pendingSettlementBusiness.getCarrierName(), pendingSettlementBusiness.getDepartureLocation(), pendingSettlementBusiness.getArrivalLocation(), pendingSettlementBusiness.getVehicleType());
            if (exactMatchingRule2!=null) {
                pendingSettlementBusiness.setIsCostMatched(1);
                pendingSettlementBusiness.setEstimatedTotalCost(exactMatchingRule2.getFreight());
                pendingSettlementBusiness.setCreateTime(date);

@@ -81,7 +88,7 @@
                estimatedReceivable.setEstimatedAmount(exactMatchingRule2.getFreight());
                estimatedReceivable.setCurrency("人民币");
                estimatedReceivable.setIsConfirmed(1);
                estimatedReceivable.setFeeType(0);
                estimatedReceivable.setFeeType(1);
                estimatedReceivables.add(estimatedReceivable);
            }
        }