From 3b02ada59b793fe7db195bbb39dbc0e533f036d6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 25 六月 2026 10:26:04 +0800
Subject: [PATCH] fix: 售后查询按照反馈日期排序
---
src/main/resources/mapper/sales/InvoiceLedgerMapper.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
index 61cc18b..8d95575 100644
--- a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
@@ -115,7 +115,7 @@
T1.customer_name,
T1.invoice_total,
IFNULL(T2.receipt_payment_amount, 0) AS receipt_payment_amount,
- IFNULL(T1.invoice_total - IFNULL(T2.receipt_payment_amount, 0), 0) AS unReceipt_payment_amount
+ IFNULL(T2.unReceipt_payment_amount, 0) AS unReceipt_payment_amount
FROM (
SELECT
customer_id,
@@ -125,12 +125,13 @@
GROUP BY customer_id, customer_name
) T1
LEFT JOIN (
- SELECT
- T3.customer_id,
- SUM(T2.receipt_payment_amount) AS receipt_payment_amount
- FROM receipt_payment T2
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- GROUP BY T3.customer_id
+ SELECT
+ sl.customer_id,
+ SUM(IFNULL(slp.shipped_quantity, 0) * IF(IFNULL(slp.quantity, 0) > 0, slp.tax_inclusive_total_price / slp.quantity, 0)) AS receipt_payment_amount,
+ SUM((IFNULL(slp.stocked_quantity, 0) - IFNULL(slp.shipped_quantity, 0)) * IF(IFNULL(slp.quantity, 0) > 0, slp.tax_inclusive_total_price / slp.quantity, 0)) AS unReceipt_payment_amount
+ FROM sales_ledger sl
+ JOIN sales_ledger_product slp ON sl.id = slp.sales_ledger_id AND slp.type = 1
+ GROUP BY sl.customer_id
) T2 ON T1.customer_id = T2.customer_id
<where>
<if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
--
Gitblit v1.9.3