From cd11bc80579a629e8ab6f9ee9e1cd982f4396408 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 12 八月 2026 10:02:07 +0800
Subject: [PATCH] feat:银行流水绑定合同问题 出库单据查看 历史当前逾期新增删除去掉 完成开票隐藏开票按钮 出库业务单据文件类型
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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 c6a44b4..5fe305a 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
@@ -11,6 +11,7 @@
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.service.PaymentOffsetService;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -30,14 +31,32 @@
private final ContractService contractService;
private final PaymentConfirmMapper paymentConfirmMapper;
+ private final BusinessCustomerMapper businessCustomerMapper;
private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
private final CurrentOverdueMapper currentOverdueMapper;
private final HistoryOverdueMapper historyOverdueMapper;
+ private final PaymentSlipMapper paymentSlipMapper;
+
@Override
public R add(PaymentOffset paymentOffset) {
baseMapper.insert(paymentOffset);
+ BusinessCustomer customer = businessCustomerMapper.selectById(paymentOffset.getBusGuestId());
+
Contract contract = contractService.getById(paymentOffset.getContractId());
+
+ //鏂板浠樻鍗�
+ PaymentSlip slip = new PaymentSlip();
+ slip.setBusGuestId(paymentOffset.getBusGuestId());
+ slip.setBusGuestName(customer.getCompanyName());
+ slip.setPayeeCompId(contract.getPartyBId());
+ slip.setPayee(contract.getPartyB());
+ slip.setPaymentTime(paymentOffset.getOffsetTime());
+ slip.setPaymentAmount(paymentOffset.getOffsetAmount());
+ slip.setPayType("3");
+ paymentSlipMapper.insert(slip);
+
+
PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
@@ -50,7 +69,7 @@
entity.setContractName(contract.getContractName());
entity.setContractNo(contract.getContractNo());
entity.setBusGuestId(paymentOffset.getBusGuestId());
- entity.setBusGuestName(paymentOffset.getBusGuestName());
+ entity.setBusGuestName(customer.getCompanyName());
entity.setBusinessType("鎶垫姽璐�");
entity.setConfirmTime(paymentOffset.getOffsetTime());
entity.setTransationAmount(paymentOffset.getOffsetAmount());
@@ -60,7 +79,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) {
@@ -118,17 +137,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