From 85016ed2734e91e4c8ea03623cde11c29964ba5a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 25 四月 2026 14:00:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 0801107..5512a8d 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -9,18 +9,17 @@
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.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
-import com.ruoyi.sales.pojo.SalesLedger;
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;
@@ -29,9 +28,9 @@
@RestController
@RequestMapping("/receiptPayment")
+@AllArgsConstructor
public class ReceiptPaymentController extends BaseController {
- @Autowired
private ReceiptPaymentService receiptPaymentService;
/**
@@ -40,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();
}
@@ -51,6 +50,7 @@
* @return
*/
@PostMapping("/update")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult receiptPaymentUpdate (@RequestBody ReceiptPayment receiptPayment) {
return AjaxResult.success(receiptPaymentService.receiptPaymentUpdate(receiptPayment));
}
@@ -61,6 +61,7 @@
* @return
*/
@DeleteMapping("/del")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult receiptPaymentDel (@RequestBody List<Integer> ids) {
return AjaxResult.success(receiptPaymentService.receiptPaymentDel(ids));
}
@@ -71,7 +72,7 @@
* @return
*/
@GetMapping("/customerInteractions")
- public AjaxResult customerInteractions (ReceiptPaymentDto receiptPaymentDto) {
+ public AjaxResult customerInteractions (InvoiceLedgerDto receiptPaymentDto) {
return AjaxResult.success(receiptPaymentService.customerInteractions(receiptPaymentDto));
}
@@ -109,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()) {
@@ -174,7 +175,7 @@
List<ReceiptPaymentRecordDto> receiptPaymentRecordDtos = new ArrayList<>();
salesLedgerIPage.getRecords().forEach(receiptPaymentRecordDto -> {
ReceiptPaymentRecordDto receiptPaymentRecordDto1 = new ReceiptPaymentRecordDto();
- BeanUtils.copyBeanProp(receiptPaymentRecordDto, receiptPaymentRecordDto1);
+ BeanUtils.copyProperties(receiptPaymentRecordDto, receiptPaymentRecordDto1);
receiptPaymentRecordDtos.add(receiptPaymentRecordDto1);
});
util.exportExcel(response, receiptPaymentRecordDtos, "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
--
Gitblit v1.9.3