From 633a003d232e37c79b7135ccda35eda1c69952c6 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 25 五月 2026 17:28:01 +0800
Subject: [PATCH] feat:统计数据测试调整

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java
index fcc0580..30ff48c 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java
@@ -77,7 +77,7 @@
 		//鏇存柊浠樻闃舵浠樻
 		List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
 				.eq(ContractPaymentSchedule::getContractId,contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus,2)
-				.orderByAsc(ContractPaymentSchedule::getCreateTime));
+				.ne(ContractPaymentSchedule::getPaymentStatus,3).orderByAsc(ContractPaymentSchedule::getCreateTime));
 		if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
 			BigDecimal remain = paymentOffset.getOffsetAmount();
 			for (ContractPaymentSchedule schedule:scheduleList) {
@@ -135,17 +135,18 @@
 		}
 		paid = paid.add(paymentOffset.getOffsetAmount());
 		contract.setPaidAmount(paid);
-		if (paid.compareTo(contract.getAmount())>0){
-			contract.setPaidAmount(contract.getAmount());
+		if (paid.compareTo(contract.getAmount())==0){
+			contract.setBillingStatus("2");
+			contract.setContractStatus(3);
 		}
 		contractService.updateById(contract);
 		// 鏌ヨ鎵�鏈変粯娆鹃樁娈垫槸鍚﹂兘浠樻瀹屾垚
-		if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
-			if (scheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))){
-				contract.setContractStatus(3);
-				contractService.updateById(contract);
-			};
-		}
+//		if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
+//			if (scheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))){
+//				contract.setContractStatus(3);
+//				contractService.updateById(contract);
+//			};
+//		}
 		return R.ok();
 	}
 }
\ No newline at end of file

--
Gitblit v1.9.1