From 7bf754a7835d06f26240c4ca15bc5f83650de377 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 21 九月 2026 20:52:25 +0800
Subject: [PATCH] docs(api): 更新信托基金与代储台账及油品出库相关接口文档
---
src/main/resources/mapper/basic/CustomerMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 75327ef..3c3aa3e 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -128,10 +128,12 @@
c.customer_name,
T1.contractAmounts AS contractAmounts,
IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
- T1.contractAmounts - (IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0)) AS receiptableAmount,
+ IFNULL(T5.receiptRecordAmount, 0) AS receiptRecordAmount,
+ T1.contractAmounts - IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount,
IFNULL(T4.returnAmount, 0) AS returnAmount
from (select customer_id, sum(contract_amount) as contractAmounts from sales_ledger group by customer_id) T1
left join (select customer_id, sum(collection_amount) as receiptPaymentAmount from account_sales_collection group by customer_id) T2 on T1.customer_id = T2.customer_id
+ left join (select party_id, sum(amount) as receiptRecordAmount from payment_record where party_type = 1 and direction = 1 group by party_id) T5 on T5.party_id = T1.customer_id
left join (
select
sl.customer_id,
@@ -142,7 +144,7 @@
where rm.status=1
group by sl.customer_id
) T4 on T4.customer_id=T1.customer_id
- left join customer c on T1.customer_id = c.id
+ inner join customer c on T1.customer_id = c.id
<where>
<if test="customerName!=null and customerName!=''">
AND c.customer_name LIKE CONCAT('%', #{customerName}, '%')
@@ -157,20 +159,40 @@
sl.execution_date,
sl.contract_amount AS contract_amount,
IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
- sl.contract_amount - (IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0)) AS receiptableAmount,
+ IFNULL(T5.receiptRecordAmount, 0) AS receiptRecordAmount,
+ sl.contract_amount - IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount,
IFNULL(T3.returnAmount, 0) AS returnAmount
from sales_ledger sl
left join (
- select
- sl.id,
- sum(ascc.collection_amount) as receiptPaymentAmount
- from account_sales_collection ascc
- left join stock_out_record sor on FIND_IN_SET(sor.id, ascc.stock_out_record_ids) > 0
- left join shipping_info s on sor.record_id = s.id
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- WHERE sor.record_type='13'
- and sor.approval_status=1
- group by sl.id
+ select x.id, sum(x.receiptPaymentAmount) as receiptPaymentAmount
+ from (
+ <!-- 鎵嬪伐鍙戣揣鍗曞嚭搴擄細鏀舵鍗曟寜 stock_out_record_ids 鍏宠仈鍑哄簱鍗曪紝鍐嶇粡 shipping_info 鎵惧埌閿�鍞彴璐� -->
+ select
+ sl.id,
+ sum(ascc.collection_amount) as receiptPaymentAmount
+ from account_sales_collection ascc
+ left join stock_out_record sor on FIND_IN_SET(sor.id, ascc.stock_out_record_ids) > 0
+ left join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ WHERE sor.record_type='13'
+ and sor.approval_status=1
+ group by sl.id
+
+ UNION ALL
+
+ <!-- 娌瑰搧鍑哄簱锛氭敹娆惧崟瀛樼殑鏄粦瀹氳 id锛屽彴璐︾洿鎺ヤ粠缁戝畾琛屼笂鍙栵紙涓�涓嚭搴撳崟鍙兘鎷嗙粰澶氫釜鍙拌处锛� -->
+ select
+ slb.id,
+ sum(ascc.collection_amount) as receiptPaymentAmount
+ from account_sales_collection ascc
+ inner join stock_out_record_sales_ledger b on FIND_IN_SET(b.id, ascc.stock_out_binding_ids) > 0
+ inner join stock_out_record sor on sor.id = b.stock_out_record_id
+ and sor.approval_status = 1
+ and (sor.type is null or sor.type = '')
+ inner join sales_ledger slb on slb.id = b.sales_ledger_id
+ group by slb.id
+ ) x
+ group by x.id
)T1 on T1.id = sl.id
left join (
select sl.id,
@@ -181,6 +203,12 @@
where rm.status=1
group by sl.id
)T3 on T3.id = sl.id
+ left join (
+ select party_id, sum(amount) as receiptRecordAmount
+ from payment_record
+ where party_type = 1 and direction = 1
+ group by party_id
+ )T5 on T5.party_id = sl.customer_id
where sl.customer_id = #{customerId}
order by sl.id desc
</select>
--
Gitblit v1.9.3