From 6b969ca247b98e5a793e61ec5b0d89f4fccb3318 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 10 六月 2026 16:25:18 +0800
Subject: [PATCH] feat:抵抹账条件新增付款金额小于开票金额，红票审核拒绝后蓝票可重新开红票
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 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 04944ea..f01f00e 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
@@ -74,7 +74,7 @@
if (StrUtil.isNotBlank(addDTO.getContractNo())) {
Contract contract = contractService.getOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, addDTO.getContractNo()));
BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
- .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
+ .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
.eq(StrUtil.isNotBlank(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId()));
if (ObjUtil.isNull(customer)) {
return R.failed("瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�");
@@ -99,7 +99,7 @@
entity.setScheduleName(lastConfirm.getScheduleName());
}
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("瀹㈡埛浠樻");
if (newtotal.compareTo(new BigDecimal("0")) > 0) {
entity.setTransationAmount(addDTO.getTransationAmount());
@@ -193,7 +193,7 @@
entity.setContractNo(addDTO.getContractNo());
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("");
entity.setTransationAmount(addDTO.getTransationAmount());
BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
@@ -225,7 +225,7 @@
return R.failed("涓烘煡璇㈠埌鏈粯娆惧悎鍚�");
}
BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
- .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
+ .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
.eq(ObjUtil.isNotNull(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId())
.last("limit 1"));
if (ObjUtil.isNull(customer)) {
@@ -234,7 +234,7 @@
//鏂板浠樻鍗�
PaymentSlip slip = new PaymentSlip();
slip.setBusGuestId(customer.getId());
- slip.setBusGuestName(customer.getCompanyName());
+ slip.setBusGuestName(customer.getRegisterName());
slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
slip.setPaymentTime(addDTO.getConfirmTime());
slip.setPaymentAmount(addDTO.getTransationAmount());
@@ -285,7 +285,7 @@
entity.setScheduleName(lastConfirm.getScheduleName());
}
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("瀹㈡埛浠樻");
if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
entity.setConfirmTime(payDate);
@@ -465,7 +465,7 @@
String result = HttpUtil.post(url + "/yonbip/EFI/collection/list?access_token=" + finalAccessToken, params.toJSONString());
log.info("SK_CX Response:{}", result);
//淇濆瓨璇锋眰璁板綍
- saveBipRequestRecord(params, result);
+ saveBipRequestRecord(params,"<XSJZ_SK_CX_001>-鏀舵鍗曟煡璇㈡帴鍙�", result);
JSONObject resultJson = JSONObject.parseObject(result);
if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
handleAndSave(bipCode, resultJson);
@@ -493,7 +493,8 @@
return params;
}
- private void getAccessToken(String accessToken) {
+ @Override
+ public String getAccessToken(String accessToken) {
long timestamp = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("appKey", appKey);
@@ -514,20 +515,22 @@
JSONObject tokenJson = JSONObject.parseObject(getTokenResult);
if (!tokenJson.containsKey("code") || !tokenJson.getString("code").equals("200")) {
log.error("Get access_token ERROR");
- return;
+ return "";
}
if (ObjUtil.isNull(tokenJson.get("data")) || ObjUtil.isNull(JSONObject.parseObject(tokenJson.getString("data")))) {
log.error("access_token value exception");
- return;
+ return "";
}
accessToken = JSONObject.parseObject(tokenJson.getString("data")).getString("access_token");
log.info("access_token value:", accessToken);
redisTemplate.opsForValue().set("BIP_TOKEN", accessToken, tokenJson.getIntValue("expire") - 10, TimeUnit.SECONDS);
+ return accessToken;
}
- private void saveBipRequestRecord(JSONObject params, String result) {
+ @Override
+ public void saveBipRequestRecord(JSONObject params, String methodName, String result) {
BipRequestRecord record = new BipRequestRecord();
- record.setInterfaceName("<XSJZ_SK_CX_001>-鏀舵鍗曟煡璇㈡帴鍙�");
+ record.setInterfaceName(methodName);
record.setRequestParams(params.toJSONString());
record.setResponseParams(result);
record.setResponseCode(JSONObject.parseObject(result).getString("code"));
@@ -568,7 +571,7 @@
return;
}
BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
- .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getCompanyName, record.getString("bodyItemCustomerName"))
+ .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getRegisterName, record.getString("bodyItemCustomerName"))
);
if (ObjUtil.isNull(customer)) {
log.error("浠樻鍗昳d锛歿},瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�", record.getString("id"));
@@ -624,7 +627,7 @@
entity.setScheduleName(lastConfirm.getScheduleName());
}
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("瀹㈡埛浠樻");
entity.setIsBip(1);
entity.setPaymentCode(record.getString("code"));
@@ -781,7 +784,7 @@
private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record,SysDept dept) {
PaymentSlip slip = new PaymentSlip();
slip.setBusGuestId(customer.getId());
- slip.setBusGuestName(customer.getCompanyName());
+ slip.setBusGuestName(customer.getRegisterName());
slip.setPayee(dept.getName());
slip.setPayeeCompId(dept.getDeptId());
slip.setPaymentTime(ObjUtil.isNotNull(record.get("billDate"))?
@@ -818,7 +821,7 @@
}
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("瀹㈡埛浠樻");
if (ObjUtil.isNotNull(record)){
entity.setIsBip(1);
--
Gitblit v1.9.1