From d8da7e76c4bd3089cf7628e441daf822bc372dfd Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 20 一月 2026 14:28:28 +0800
Subject: [PATCH] yys 回款提示
---
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index cf9d93e..8a02f83 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -120,6 +120,10 @@
<if test="req.status != null and req.status">
and (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total, 0)) > 0
</if>
+ <if test="req.timeOut != null and req.timeOut">
+ AND T1.invoice_date < DATE_SUB(CURDATE(), INTERVAL 15 DAY)
+ AND (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) > 0
+ </if>
</where>
ORDER BY IFNULL(T2.create_time, T1.create_time) DESC
@@ -210,10 +214,7 @@
T4.customer_contract_no
FROM
receipt_payment T1
- LEFT JOIN
- invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id
+ LEFT JOIN sales_ledger T4 ON T1.sales_ledger_id = T4.id
LEFT JOIN customer T5 ON T5.id = T4.customer_id
<where>
<if test="params.searchText != null and params.searchText != '' ">
@@ -435,5 +436,22 @@
</where>
</select>
+ <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
+ SELECT
+ T1.sales_contract_no,
+ SUM(contract_amount) AS invoice_total,
+ IFNULL( SUM(T2.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
+ IFNULL((IFNULL(SUM(contract_amount),0) - IFNULL(SUM(T2.receipt_payment_amount),0)),0) AS unReceipt_payment_amount,
+ T2.receipt_payment_date
+ FROM sales_ledger T1
+ LEFT JOIN receipt_payment T2 ON T1.id = T2.sales_ledger_id
+ <where>
+ T1.customer_id = #{invoiceLedgerDto.customerId}
+ <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
+ T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
+ </if>
+ </where>
+ GROUP BY T1.sales_contract_no,T2.receipt_payment_date
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3