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/mapper/ReceiptPaymentMapper.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
index 9801d3d..e7b34ed 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
@@ -3,10 +3,16 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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.dto.ReceiptPaymentExeclDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> {
@@ -20,7 +26,7 @@
* @param receiptPaymentDto
* @return
*/
- IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto);
+ IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("c") ReceiptPaymentDto receiptPaymentDto);
/**
* 寮�绁ㄥ彴璐﹁鎯�
@@ -28,4 +34,47 @@
* @return
*/
InvoiceLedgerDto invoiceInfo(Integer id);
+
+ /**
+ * 璁＄畻鍓嶅灏戞潯鏁版嵁鍥炴閲戦缁煎悎
+ * @param customerId
+ * @param total
+ * @return
+ */
+ BigDecimal getReceiptAmount(@Param("customerId") Integer customerId, @Param("total") long total);
+
+ /**
+ * 鏌ヨ鍥炴璁板綍
+ */
+ List<ReceiptPaymentDto> receiptPaymentHistoryList(@Param("params") ReceiptPaymentDto receiptPaymentDto);
+
+ /**
+ * 鏌ヨ鍥炴璁板綍鍒嗛〉
+ */
+ IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page,@Param("params") ReceiptPaymentDto receiptPaymentDto);
+
+ /**
+ * 瀹㈡埛寰�鏉ヨ褰曟煡璇�
+ * @param receiptPaymentDto
+ * @return
+ */
+ List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);
+
+ /**
+ * 鏌ヨ鍥炴璁板綍涓嶅垎椤�
+ */
+ List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage( @Param("params") ReceiptPaymentDto receiptPaymentDto);
+
+ /**
+ * 閫氳繃寮�绁ㄧ櫥璁颁骇鍝乮d鏌ヨ鏄惁宸茬粡鏈夊洖娆捐褰�
+ * @param invoiceRegistrationProductId
+ * @return
+ */
+ List<ReceiptPayment> receiptPaymentListByProdRegId(Integer invoiceRegistrationProductId);
+
+ List<ReceiptPaymentDto> bindInvoiceNoRegListAll();
+
+ List<ReceiptPaymentExeclDto> bindInvoiceNoRegListByIds(List<Long> ids,Long tenantId);
+
+
}
--
Gitblit v1.9.3