From 7fe4969de94ec291b9f08e45a4570c7b32337b25 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 13:42:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java b/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
index a0550e2..a32967c 100644
--- a/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
+++ b/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
@@ -48,7 +48,10 @@
List<EstimatedReceivable> estimatedReceivables = new ArrayList<>();
for (PendingSettlementBusiness pendingSettlementBusiness : pendingSettlementBusinesses) {
- pendingSettlementBusiness.setIsCreate(1);
+ 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) {
//搴旀敹鏁版嵁
@@ -66,6 +69,7 @@
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());
--
Gitblit v1.8.0