From 96118de3ac74f5468cf5d4ac73d6ea3bec1da010 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 20 十一月 2026 14:36:25 +0800
Subject: [PATCH] feat:新增销售指标 产品板块 重点工作 专项业务 产品收入和合同统计修改功能 feat:承兑新增承兑编号字段 feat:客商主数据更新名称 专项业务去年同月字段 机动车销售发票地址字段及判断 feat:银行流水更新客户id feat:机动车销售发票新增税务及代码字段 feat:流水更新按钮参数 feat:检索新增标的物运维按钮

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
index 13a4196..dbb4551 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
@@ -142,7 +142,7 @@
 	public void handleBeforeRemain(PaymentConfirm currentConfim, Contract contract) {
 		//瀹㈡埛浠樻瀹屾垚鍚堝悓
 		List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
-				.eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).eq(Contract::getContractStatus, 3));
+				.eq(Contract::getPartyBId, contract.getCompId()).eq(Contract::getContractStatus, 3));
 		if (CollUtil.isNotEmpty(customerCompleteContractList)) {
 			List<BigDecimal> outAmountList = new ArrayList<>();
 			for (Contract completeContract : customerCompleteContractList) {
@@ -159,6 +159,7 @@
 					outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
 					outConfirm.setTotalAmount(new BigDecimal("0"));
 					if (contract.getContractNo().startsWith("ZB-")) {
+						outConfirm.setCompId(contract.getCompId());
 						paymentConfirmMapper.insert(outConfirm);
 					}
 					outAmountList.add(contractLastConfirm.getTotalAmount());
@@ -179,6 +180,7 @@
 					inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
 				}
 				if (contract.getContractNo().startsWith("ZB-")) {
+					inConfirm.setCompId(contract.getCompId());
 					paymentConfirmMapper.insert(inConfirm);
 				}
 				contract.setPaidAmount(currentSum);
@@ -205,6 +207,9 @@
 		}
 		if (ObjUtil.isNull(afterOneSchedule)) {
 			contract.setNextScheduleName("");
+			if (contract.getPaidAmount().compareTo(contract.getAmount()) == 0 && contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
+				contract.setContractStatus(3);
+			}
 		}
 		contractMapper.updateById(contract);
 		//鏇存柊灞ョ害闃舵鏃堕棿

--
Gitblit v1.9.1