From 05de62989998157eab6ae4809ec3a45db6783e10 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 10 六月 2025 15:36:54 +0800
Subject: [PATCH] 开票台账删除功能修改

---
 src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java |   76 +++++++++++++++++++++++++++++++++----
 1 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 7279df7..3e3013e 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -1,7 +1,11 @@
 package com.ruoyi.sales.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.purchase.dto.InvoicePurchaseDto;
 import com.ruoyi.sales.dto.ReceiptPaymentDto;
 import com.ruoyi.sales.pojo.ReceiptPayment;
 import com.ruoyi.sales.service.ReceiptPaymentService;
@@ -13,7 +17,7 @@
 
 @RestController
 @RequestMapping("/receiptPayment")
-public class ReceiptPaymentController {
+public class ReceiptPaymentController extends BaseController {
 
     @Autowired
     private ReceiptPaymentService receiptPaymentService;
@@ -50,14 +54,13 @@
     }
 
     /**
-     * 鍥炴鐧昏鍒嗛〉鏌ヨ
-     * @param page
+     * 瀹㈡埛寰�鏉ヨ褰曟煡璇�
      * @param receiptPaymentDto
      * @return
      */
-    @GetMapping("/listPage")
-    public AjaxResult receiptPaymentListPage (Page page, ReceiptPaymentDto receiptPaymentDto) {
-        return AjaxResult.success(receiptPaymentService.receiptPaymentListPage(page,receiptPaymentDto));
+    @GetMapping("/customerInteractions")
+    public AjaxResult customerInteractions (ReceiptPaymentDto receiptPaymentDto) {
+        return AjaxResult.success(receiptPaymentService.customerInteractions(receiptPaymentDto));
     }
 
     /**
@@ -76,10 +79,65 @@
     @GetMapping("/getReceiptAmount")
     public AjaxResult getReceiptAmount() {
         try {
-            BigDecimal amount = receiptPaymentService.getReceiptAmount();
-            return AjaxResult.success(amount != null ? amount : BigDecimal.ZERO);
+            BigDecimal receiptAmount = receiptPaymentService.getReceiptAmount();
+            return AjaxResult.success(receiptAmount != null ? receiptAmount : BigDecimal.ZERO);
         } catch (Exception e) {
-            return AjaxResult.error("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
+            return AjaxResult.error("鑾峰彇鍥炴閲戦澶辫触锛�" + e.getMessage());
         }
     }
+
+    /**
+     * 鏌ヨ宸茬粡缁戝畾鍙戠エ鐨勫紑绁ㄥ彴璐�
+     * @param page
+     * @param receiptPaymentDto
+     * @return
+     */
+    @GetMapping("/bindInvoiceNoRegPage")
+    public AjaxResult bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
+        return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
+    }
+
+    /**
+     * 寮�绁ㄥ彴璐﹁鎯�
+     * @param id
+     * @return
+     */
+    @GetMapping("/invoiceInfo")
+    public AjaxResult invoiceInfo (Integer id) {
+        return AjaxResult.success(receiptPaymentService.invoiceInfo(id));
+    }
+
+    /**
+     * 鏈湀搴旀敹,鍥炴閲戦
+     */
+    @GetMapping("/getAmountMouth")
+    public AjaxResult getAmountMouth() {
+        return  AjaxResult.success(receiptPaymentService.getAmountMouth());
+    }
+
+    /**
+     * 鏌ヨ鍥炴璁板綍
+     */
+    @GetMapping("/receiptPaymentHistoryList")
+    public TableDataInfo receiptPaymentHistoryList(ReceiptPaymentDto receiptPaymentDto) {
+        startPage();
+        List<ReceiptPaymentDto> list = receiptPaymentService.receiptPaymentHistoryList(receiptPaymentDto);
+        return getDataTable(list);
+    }
+
+    /**
+     * 鏌ヨ鍥炴璁板綍
+     */
+    @GetMapping("/receiptPaymentHistoryListPage")
+    public IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
+        return receiptPaymentService.receiptPaymentHistoryListPage(page,receiptPaymentDto);
+    }
+
+    /**
+     * 鏌ヨ鍥炴璁板綍涓嶅垎椤�
+     */
+    @GetMapping("/receiptPaymentHistoryListNoPage")
+    public List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto) {
+        return receiptPaymentService.receiptPaymentHistoryListNoPage(receiptPaymentDto);
+    }
 }

--
Gitblit v1.9.3