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 | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 18b4fa6..85a7a4c 100644
--- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -2,11 +2,12 @@
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 org.apache.ibatis.annotations.Param;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -77,4 +78,26 @@
* 鏌ヨ鍥炴璁板綍鍒嗛〉
*/
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