From 82a1cf87de473e970185d6a60291f8087efa5afd Mon Sep 17 00:00:00 2001 From: wujianwei <wjw@11.com> Date: 星期一, 18 八月 2025 13:42:24 +0800 Subject: [PATCH] 新增确认取消判断 --- quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java | 9 ++++++++- 1 files changed, 8 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..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,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); } } -- Gitblit v1.8.0