From 44820d331c44d7ad56f498306648d39bfe3c0054 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 09:23:42 +0800
Subject: [PATCH] 添加
---
quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java | 5 ++++-
1 files changed, 4 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 398a4c4..efc10ca 100644
--- a/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
+++ b/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
@@ -51,6 +51,7 @@
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 +65,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 +84,7 @@
estimatedReceivable.setEstimatedAmount(exactMatchingRule2.getFreight());
estimatedReceivable.setCurrency("浜烘皯甯�");
estimatedReceivable.setIsConfirmed(1);
- estimatedReceivable.setFeeType(0);
+ estimatedReceivable.setFeeType(1);
estimatedReceivables.add(estimatedReceivable);
}
}
--
Gitblit v1.8.0