From dd4284136cb12dc3c2e498e0f0ff002d553763af Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 25 八月 2026 15:35:41 +0800
Subject: [PATCH] feat:feat:新增降点损 赊销业务均使用代储

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 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 2df9d21..f492085 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
@@ -209,18 +209,15 @@
 				}
 				paid = paid.add(addDTO.getTransationAmount());
 				contract.setPaidAmount(paid);
-				if (paid.compareTo(contract.getAmount()) == 0) {
+				if (paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) == 0&&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
 					contract.setContractStatus(3);
-					contract.setPaidAmount(contract.getAmount());
+					contract.setPaidAmount(contract.getAmount().subtract(contract.getDropAmount()));
 				}
 				contractService.updateById(contract);
 			}else {
 				List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId,contract.getId())
 						.eq(ContractExecDate::getGenFlag,"0"));
-				List<MeterReadRecord> recordList = meterReadRecordMapper.selectList(Wrappers.<MeterReadRecord>lambdaQuery()
-						.eq(MeterReadRecord::getContractId,contract.getId())
-						.isNull(MeterReadRecord::getMeterReadNum));
-				if (CollUtil.isEmpty(execDateList)&&CollUtil.isEmpty(recordList)){
+				if (CollUtil.isEmpty(execDateList)){
 					//鏇存柊鍚堝悓宸蹭粯娆�
 					BigDecimal paid = new BigDecimal("0");
 					if (ObjUtil.isNotNull(contract.getPaidAmount())) {
@@ -228,7 +225,7 @@
 					}
 					paid = paid.add(addDTO.getTransationAmount());
 					contract.setPaidAmount(paid);
-					if (contract.getAmount().compareTo(new BigDecimal("0"))==0&&paid.compareTo(contract.getAmount()) >= 0) {
+					if (contract.getBillingAmout().compareTo(contract.getAmount())==0&&paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0) {
 						contract.setContractStatus(3);
 						contract.setPaidAmount(contract.getAmount());
 					}
@@ -528,7 +525,7 @@
 					throw new RuntimeException(e);
 				}
 				log.info("閾惰娴佹按鏌ヨ Request:{}", params.toJSONString());
-				String result = HttpUtil.post(url + "/iuap-api-auth/yonbip/ctm/cmp/bankReconciliationQuery?access_token=" + finalAccessToken, params.toJSONString());
+				String result = HttpUtil.post(url + "/yonbip/ctm/cmp/bankReconciliationQuery?access_token=" + finalAccessToken, params.toJSONString());
 				log.info("閾惰娴佹按鏌ヨ Response:{}", result);
 				//淇濆瓨璇锋眰璁板綍
 				saveBipRequestRecord(params, "閾惰娴佹按鏌ヨ鎺ュ彛", result);
@@ -558,7 +555,7 @@
 		} catch (InvalidKeyException e) {
 			throw new RuntimeException(e);
 		}
-		String getTokenResult = HttpUtil.get(url + "/iuap-api-auth/open-auth/selfAppAuth/getAccessToken?appKey=" + appKey + "&timestamp=" + timestamp
+		String getTokenResult = HttpUtil.get(url + "/open-auth/selfAppAuth/getAccessToken?appKey=" + appKey + "&timestamp=" + timestamp
 				+ "&signature=" + signature);
 		log.info("Get access_token Response:{}", getTokenResult);
 		JSONObject tokenJson = JSONObject.parseObject(getTokenResult);

--
Gitblit v1.9.1