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 | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index e1df0a6..3c3aa3e 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -164,16 +164,35 @@
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,
--
Gitblit v1.9.3