From dc22724f61e0b792d327fa812895f6dc4fcf129d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 08 四月 2026 15:04:11 +0800
Subject: [PATCH] fix:groupBy

---
 src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 52 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 2914230..fcfcd34 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
@@ -3,12 +3,15 @@
 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.List;
 
 public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> {
 
@@ -18,14 +21,16 @@
 
     /**
      * 鏌ヨ宸茬粡缁戝畾鍙戠エ鐨勫紑绁ㄥ彴璐�
+     *
      * @param page
      * @param receiptPaymentDto
      * @return
      */
-    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto);
+    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("req") ReceiptPaymentDto receiptPaymentDto);
 
     /**
      * 寮�绁ㄥ彴璐﹁鎯�
+     *
      * @param id
      * @return
      */
@@ -33,10 +38,56 @@
 
     /**
      * 璁$畻鍓嶅灏戞潯鏁版嵁鍥炴閲戦缁煎悎
+     *
      * @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);
+
+    /**
+     * 瀹㈡埛鍥炴璁板綍鏌ヨ
+     *
+     * @param invoiceLedgerDto
+     * @return
+     */
+    List<InvoiceLedgerDto> invoiceLedgerSalesAccount(@Param("invoiceLedgerDto") InvoiceLedgerDto invoiceLedgerDto);
+
+    /**
+     * 鏌ヨ鍥炴璁板綍涓嶅垎椤�
+     */
+    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);
+
+
+    List<InvoiceLedgerDto> customerSalesInteractions(@Param("ew") InvoiceLedgerDto receiptPaymentDto);
 }

--
Gitblit v1.9.3