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/service/ReceiptPaymentService.java |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
index 435a065..8ad9711 100644
--- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -2,15 +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.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -18,13 +15,15 @@
 
     /**
      * 鍥炴鐧昏鏂板
+     *
      * @param receiptPayment
      * @return
      */
-    int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment);
+    int receiptPaymentSaveOrUpdate(List<ReceiptPayment> receiptPayment);
 
     /**
      * 鍥炴鐧昏淇敼
+     *
      * @param receiptPayment
      * @return
      */
@@ -32,6 +31,7 @@
 
     /**
      * 鍥炴鐧昏鍒犻櫎
+     *
      * @param ids
      * @return
      */
@@ -39,14 +39,16 @@
 
     /**
      * 鍥炴鐧昏鍒嗛〉鏌ヨ
+     *
      * @param page
      * @param receiptPaymentDto
      * @return
      */
-    IPage<ReceiptPaymentDto> receiptPaymentListPage (Page page, ReceiptPaymentDto receiptPaymentDto);
+    IPage<ReceiptPaymentDto> receiptPaymentListPage(Page page, ReceiptPaymentDto receiptPaymentDto);
 
     /**
      * 鍥炴鐧昏璇︽儏
+     *
      * @param id
      * @return
      */
@@ -56,6 +58,7 @@
 
     /**
      * 鏌ヨ宸茬粡缁戝畾鍙戠エ鐨勫紑绁ㄥ彴璐�
+     *
      * @param page
      * @param receiptPaymentDto
      * @return
@@ -64,12 +67,13 @@
 
     /**
      * 寮�绁ㄥ彴璐﹁鎯�
+     *
      * @param id
      * @return
      */
     InvoiceLedgerDto invoiceInfo(Integer id);
 
-    Map<String,BigDecimal> getAmountMouth();
+    Map<String, BigDecimal> getAmountMouth();
 
     /**
      * 鏌ヨ鍥炴璁板綍
@@ -83,10 +87,11 @@
 
     /**
      * 瀹㈡埛寰�鏉ヨ褰曟煡璇�
+     *
      * @param receiptPaymentDto
      * @return
      */
-    List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);
+    List<InvoiceLedgerDto> customerInteractions(InvoiceLedgerDto receiptPaymentDto);
 
     /**
      * 鏌ヨ鍥炴璁板綍鍒嗛〉
@@ -101,5 +106,13 @@
     /**
      * 閮ㄥ垎瀵煎嚭鍥炴鍒楄〃
      */
-    void exportPaymentList(HttpServletResponse response, ArrayList<Long> ids);
+    void exportPaymentList(HttpServletResponse response, List<Long> ids);
+
+    /**
+     * 瀹㈡埛閿�鍞褰曟煡璇�
+     *
+     * @param receiptPaymentDto
+     * @return
+     */
+    List<InvoiceLedgerDto> customerSalesInteractions(InvoiceLedgerDto receiptPaymentDto);
 }

--
Gitblit v1.9.3