From e2aa651db9f17d58819329de571037edc0f9eba2 Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期一, 23 六月 2025 18:13:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java | 65 ++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java index c31176e..85a7a4c 100644 --- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java +++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java @@ -2,10 +2,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.sales.dto.CustomerInteractionDto; +import com.ruoyi.sales.dto.InvoiceLedgerDto; import com.ruoyi.sales.dto.ReceiptPaymentDto; import com.ruoyi.sales.pojo.ReceiptPayment; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.util.List; +import java.util.Map; public interface ReceiptPaymentService { @@ -14,7 +19,7 @@ * @param receiptPayment * @return */ - int receiptPaymentAdd(ReceiptPayment receiptPayment); + int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment); /** * 鍥炴鐧昏淇敼 @@ -37,4 +42,62 @@ * @return */ IPage<ReceiptPaymentDto> receiptPaymentListPage (Page page, ReceiptPaymentDto receiptPaymentDto); + + /** + * 鍥炴鐧昏璇︽儏 + * @param id + * @return + */ + ReceiptPaymentDto receiptPaymentInfo(Integer id); + + BigDecimal getReceiptAmount(); + + /** + * 鏌ヨ宸茬粡缁戝畾鍙戠エ鐨勫紑绁ㄥ彴璐� + * @param page + * @param receiptPaymentDto + * @return + */ + IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto); + + /** + * 寮�绁ㄥ彴璐﹁鎯� + * @param id + * @return + */ + InvoiceLedgerDto invoiceInfo(Integer id); + + Map<String,BigDecimal> getAmountMouth(); + + /** + * 鏌ヨ鍥炴璁板綍 + */ + List<ReceiptPaymentDto> receiptPaymentHistoryList(ReceiptPaymentDto receiptPaymentDto); + + /** + * 鏌ヨ鍥炴璁板綍鍒嗛〉 + */ + IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto); + + /** + * 瀹㈡埛寰�鏉ヨ褰曟煡璇� + * @param receiptPaymentDto + * @return + */ + List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto); + + /** + * 鏌ヨ鍥炴璁板綍鍒嗛〉 + */ + List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto); + + /** + * 鍏ㄥ鍑哄洖娆惧垪琛� + */ + void exportPaymentList(HttpServletResponse response); + + /** + * 閮ㄥ垎瀵煎嚭鍥炴鍒楄〃 + */ + void exportPaymentList(HttpServletResponse response, List<Long> ids); } -- Gitblit v1.9.3