From 80821b70c41a06952fa50207a9a82fa289e0152e Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 04 九月 2025 14:16:29 +0800
Subject: [PATCH] 修改接口
---
quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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 3b95939..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,8 +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();
@@ -62,12 +68,28 @@
estimatedReceivable.setEstimatedAmount(exactMatchingRule.getFreight());
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);
+
+ EstimatedReceivable estimatedReceivable = new EstimatedReceivable();
+ estimatedReceivable.setFeeSystemNo("YF"+datePart+RandomUtils.random(5));
+ estimatedReceivable.setDispatchNo(pendingSettlementBusiness.getDispatchNo());
+ estimatedReceivable.setCustomerName(pendingSettlementBusiness.getCustomerName());
+ estimatedReceivable.setProjectName(pendingSettlementBusiness.getProjectName());
+ estimatedReceivable.setOrderDate(pendingSettlementBusiness.getCreatedTime());
+ estimatedReceivable.setFeeName("杩愯垂");
+ estimatedReceivable.setEstimatedAmount(exactMatchingRule2.getFreight());
+ estimatedReceivable.setCurrency("浜烘皯甯�");
+ estimatedReceivable.setIsConfirmed(1);
+ estimatedReceivable.setFeeType(1);
+ estimatedReceivables.add(estimatedReceivable);
}
}
if (CollectionUtil.isNotEmpty(estimatedReceivables)){
--
Gitblit v1.8.0