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/PaymentConfirmServiceImpl.java |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
index 2549e3e..d99ad09 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
@@ -56,6 +56,13 @@
 @RequiredArgsConstructor
 public class PaymentConfirmServiceImpl extends ServiceImpl<PaymentConfirmMapper, PaymentConfirm> implements PaymentConfirmService {
 
+
+	@Value("${dept.smj}")
+	private String smj;
+
+	@Value("${dept.smjhw}")
+	private String smjhw;
+
 	private final ContractService contractService;
 	private final BusinessCustomerService businessCustomerService;
 	private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
@@ -154,7 +161,8 @@
 			}
 			paid = paid.add(addDTO.getTransationAmount());
 			contract.setPaidAmount(paid);
-			if (paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0&&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
+			if (paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0&&contract.getBillingAmout().compareTo(contract.getAmount())==0&&
+					StrUtil.isBlank(contract.getNextScheduleName())) {
 				contract.setContractStatus(3);
 				contract.setPaidAmount(contract.getAmount().subtract(contract.getDropAmount()));
 			}
@@ -170,7 +178,8 @@
 				}
 				paid = paid.add(addDTO.getTransationAmount());
 				contract.setPaidAmount(paid);
-				if (contract.getBillingAmout().compareTo(contract.getAmount())==0&&paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0) {
+				if (contract.getBillingAmout().compareTo(contract.getAmount())==0&&paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0&&
+						StrUtil.isBlank(contract.getNextScheduleName())) {
 					contract.setContractStatus(3);
 					contract.setPaidAmount(contract.getAmount());
 				}
@@ -283,6 +292,7 @@
 		slip.setPaymentAmount(addDTO.getTransationAmount());
 		slip.setPayType(addDTO.getPayType());
 		slip.setContractId(contract.getId());
+		slip.setPaymentNumber(addDTO.getPaymentCode());
 		paymentSlipMapper.insert(slip);
 	}
 
@@ -410,10 +420,30 @@
 		log.info("==================寮�濮嬪鐞嗛摱琛屾祦姘翠俊鎭�===================");
 		recordList.stream().forEach(obj -> {
 			JSONObject record = (JSONObject) obj;
-			BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
-					.eq(BusinessCustomer::getCompanyName, record.getString("to_acct_name"))
-					.eq(BusinessCustomer::getCompId,dept.getDeptId())
-			);
+//			Long compId = null;
+//			if (StrUtil.contains(record.getString("to_acct_name"),"鐭冲搴勭叅鐭挎満姊版湁闄愯矗浠诲叕鍙�")){
+//				compId = 2089995177814495234L;
+//			}else {
+//				compId = dept.getDeptId();
+//			}
+//			BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
+//					.eq(BusinessCustomer::getCompanyName, record.getString("to_acct_name"))
+//					.eq(BusinessCustomer::getCompId,compId));
+			BusinessCustomer customer = null;
+			if (StrUtil.equals(record.getString("to_acct_name"),"鐭冲搴勭叅鐭挎満姊版湁闄愯矗浠诲叕鍙�")){
+				List<String> smjList = new ArrayList<>();
+				smjList.add(smj);
+				smjList.add(smjhw);
+				customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
+						.eq(BusinessCustomer::getCompanyName, record.getString("to_acct_name"))
+						.in(BusinessCustomer::getCompId, smjList)
+						.last("limit 1"));
+			}else {
+				customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
+						.eq(BusinessCustomer::getCompanyName, record.getString("to_acct_name"))
+						.eq(BusinessCustomer::getCompId,dept.getDeptId())
+						.last("limit 1"));
+			}
 			//淇濆瓨浠樻鍗�
 			Boolean codeFlag = saveBankStatement(customer, record,dept);
 			if (!codeFlag) {

--
Gitblit v1.9.1