From 13ef502835ce8bd84a797e97066d6684cb82889a Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 11:32:34 +0800
Subject: [PATCH] 修改
---
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java
index 6fcc699..02aef7d 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.cwgl.service.impl;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -158,19 +159,19 @@
throw new ServiceException("缁撶畻涓垨宸茬粨绠楁棤娉曚慨鏀�");
}
//鍘熸湰閲戦
- Long oldAmount = estimatedReceivable1.getEstimatedAmount();
+ BigDecimal oldAmount = estimatedReceivable1.getEstimatedAmount();
//鏂伴噾棰�
- Long newAmount = estimatedReceivable.getEstimatedAmount();
+ BigDecimal newAmount = estimatedReceivable.getEstimatedAmount();
if (!oldAmount.equals(newAmount)) {
PendingSettlementBusiness pendingSettlementBusiness = pendingSettlementBusinessMapper.selectPendingSettlementBusinessByNo(estimatedReceivable.getDispatchNo());
if (pendingSettlementBusiness!=null) {
- Long estimatedTotalIncome = pendingSettlementBusiness.getEstimatedTotalIncome();
- pendingSettlementBusiness.setEstimatedTotalIncome(estimatedTotalIncome-oldAmount+newAmount);
+ BigDecimal estimatedTotalIncome = pendingSettlementBusiness.getEstimatedTotalIncome();
+ pendingSettlementBusiness.setEstimatedTotalIncome(estimatedTotalIncome.subtract(oldAmount).add(newAmount));
pendingSettlementBusinessMapper.updatePendingSettlementBusiness(pendingSettlementBusiness);
if (pendingSettlementBusiness.getBillId() != null) {
EstimatedReceivableBill estimatedReceivableBill = estimatedReceivableBillMapper.selectEstimatedReceivableBillById(pendingSettlementBusiness.getBillId());
- estimatedReceivableBill.setTotalAmount(estimatedReceivableBill.getTotalAmount() -oldAmount + newAmount);
+ estimatedReceivableBill.setTotalAmount(estimatedReceivableBill.getTotalAmount().subtract( oldAmount).add( newAmount));
estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
}
--
Gitblit v1.8.0