From 684e4306a08feeae188070f264148e6765da8dcf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 20 九月 2026 19:25:15 +0800
Subject: [PATCH] feat(account): 更新往来付款回款流水表及接口
---
src/main/resources/mapper/basic/SupplierManageMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 0c104c1..bcadd9e 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -74,12 +74,12 @@
sm.supplier_name,
T1.contractAmounts,
IFNULL(T2.paymentAmount, 0) AS paymentAmount,
- IFNULL(T5.receiptAmount, 0) AS receiptAmount,
+ IFNULL(T5.paymentRecordAmount, 0) AS paymentRecordAmount,
T1.contractAmounts - IFNULL(T2.paymentAmount, 0) - IFNULL(T4.returnAmount, 0) AS payableAmount,
IFNULL(T4.returnAmount, 0) AS returnAmount
from (select supplier_id, sum(contract_amount) as contractAmounts from purchase_ledger group by supplier_id) T1
left join (select supplier_id, sum(payment_amount) as paymentAmount from account_purchase_payment group by supplier_id) T2 on T1.supplier_id = T2.supplier_id
- left join (select party_id, sum(amount) as receiptAmount from payment_record where party_type = 2 and direction = 2 group by party_id) T5 on T5.party_id = T1.supplier_id
+ left join (select party_id, sum(amount) as paymentRecordAmount from payment_record where party_type = 2 and direction = 2 group by party_id) T5 on T5.party_id = T1.supplier_id
left join (
select
supplier_id,
@@ -102,7 +102,7 @@
pl.execution_date,
pl.contract_amount AS contract_amount,
IFNULL(T1.paymentAmount, 0) AS paymentAmount,
- IFNULL(T5.receiptAmount, 0) AS receiptAmount,
+ IFNULL(T5.paymentRecordAmount, 0) AS paymentRecordAmount,
pl.contract_amount - IFNULL(T1.paymentAmount, 0) - IFNULL(T3.returnAmount, 0) AS payableAmount,
IFNULL(T3.returnAmount, 0) AS returnAmount
from purchase_ledger pl
@@ -130,7 +130,7 @@
group by pl.id
)T3 on T3.id = pl.id
left join (
- select party_id, sum(amount) as receiptAmount
+ select party_id, sum(amount) as paymentRecordAmount
from payment_record
where party_type = 2 and direction = 2
group by party_id
--
Gitblit v1.9.3