From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 98b1105..5512a8d 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -2,18 +2,24 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 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.InvoiceLedgerDto;
 import com.ruoyi.sales.dto.ReceiptPaymentDto;
+import com.ruoyi.sales.dto.ReceiptPaymentRecordDto;
 import com.ruoyi.sales.pojo.ReceiptPayment;
 import com.ruoyi.sales.service.ReceiptPaymentService;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,9 +28,9 @@
 
 @RestController
 @RequestMapping("/receiptPayment")
+@AllArgsConstructor
 public class ReceiptPaymentController extends BaseController {
 
-    @Autowired
     private ReceiptPaymentService receiptPaymentService;
 
     /**
@@ -33,7 +39,7 @@
      * @return
      */
     @PostMapping("/saveOrUpdate")
-    public AjaxResult receiptPaymentSaveOrUpdate (@RequestBody ReceiptPayment receiptPayment) {
+    public AjaxResult receiptPaymentSaveOrUpdate (@RequestBody List<ReceiptPayment> receiptPayment) {
         receiptPaymentService.receiptPaymentSaveOrUpdate(receiptPayment);
         return AjaxResult.success();
     }
@@ -44,6 +50,7 @@
      * @return
      */
     @PostMapping("/update")
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult receiptPaymentUpdate (@RequestBody ReceiptPayment receiptPayment) {
         return AjaxResult.success(receiptPaymentService.receiptPaymentUpdate(receiptPayment));
     }
@@ -54,6 +61,7 @@
      * @return
      */
     @DeleteMapping("/del")
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult receiptPaymentDel (@RequestBody List<Integer> ids) {
         return AjaxResult.success(receiptPaymentService.receiptPaymentDel(ids));
     }
@@ -64,7 +72,7 @@
      * @return
      */
     @GetMapping("/customerInteractions")
-    public AjaxResult customerInteractions (ReceiptPaymentDto receiptPaymentDto) {
+    public AjaxResult customerInteractions (InvoiceLedgerDto receiptPaymentDto) {
         return AjaxResult.success(receiptPaymentService.customerInteractions(receiptPaymentDto));
     }
 
@@ -102,7 +110,7 @@
         return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
     }
 
-    @ApiModelProperty("瀵煎嚭鍥炴鐧昏")
+    @Schema(description = "瀵煎嚭鍥炴鐧昏")
     @PostMapping("/export")
     public void export(HttpServletResponse response, String ids) {
         if (ids == null || ids.isEmpty()) {
@@ -154,6 +162,26 @@
     }
 
     /**
+     * 瀵煎嚭鍥炴娴佹按鍒楄〃
+     */
+    @Log(title = "瀵煎嚭鍥炴娴佹按鍒楄〃", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportOne")
+    public void exportOne(HttpServletResponse response, ReceiptPaymentDto salesLedgerDto) {
+        Page page = new Page();
+        page.setCurrent(-1);
+        page.setSize(-1);
+        IPage<ReceiptPaymentDto> salesLedgerIPage = receiptPaymentHistoryListPage(page, salesLedgerDto);
+        ExcelUtil<ReceiptPaymentRecordDto> util = new ExcelUtil<ReceiptPaymentRecordDto>(ReceiptPaymentRecordDto.class);
+        List<ReceiptPaymentRecordDto> receiptPaymentRecordDtos = new ArrayList<>();
+        salesLedgerIPage.getRecords().forEach(receiptPaymentRecordDto -> {
+            ReceiptPaymentRecordDto receiptPaymentRecordDto1 = new ReceiptPaymentRecordDto();
+            BeanUtils.copyProperties(receiptPaymentRecordDto, receiptPaymentRecordDto1);
+            receiptPaymentRecordDtos.add(receiptPaymentRecordDto1);
+        });
+        util.exportExcel(response, receiptPaymentRecordDtos, "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
+    }
+
+    /**
      * 鏌ヨ鍥炴璁板綍涓嶅垎椤�
      */
     @GetMapping("/receiptPaymentHistoryListNoPage")

--
Gitblit v1.9.3