From 4ea1509f0e88ee331e821459d4eefb0c9902b3e7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 12 八月 2026 13:16:04 +0800
Subject: [PATCH] feat(account): 实现采购付款和销售回款功能
---
src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
index 3c610a1..4572af1 100644
--- a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
+++ b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
@@ -1,13 +1,22 @@
package com.ruoyi.sales.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.service.sales.AccountSalesCollectionService;
+import com.ruoyi.basic.service.ICustomerService;
+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.domain.R;
+import com.ruoyi.sales.dto.SaveReceiptPaymentDto;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.service.impl.MetricStatisticsServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -15,24 +24,47 @@
* @author :yys
* @date : 2026/1/15 9:39
*/
-@Api(tags = "鎸囨爣缁熻")
+@Tag(name = "鎸囨爣缁熻")
@RestController
@RequestMapping("/metricStatistics")
+@AllArgsConstructor
public class MetricStatisticsController extends BaseController {
- @Autowired
- private MetricStatisticsServiceImpl metricStatisticsService;
+ private final MetricStatisticsServiceImpl metricStatisticsService;
+ private final ICustomerService customerService;
+ private final AccountSalesCollectionService accountSalesCollectionService;
- @ApiOperation("澶撮儴鎬昏")
+ @Operation(summary = "澶撮儴鎬昏")
@GetMapping("/total")
public AjaxResult total() {
return metricStatisticsService.total();
}
- @ApiOperation("缁熻琛�")
+ @Operation(summary = "缁熻琛�")
@GetMapping("/statisticsTable")
public AjaxResult statisticsTable(StatisticsTableDto statisticsTableDto) {
return metricStatisticsService.statisticsTable(statisticsTableDto);
}
+ @GetMapping("/customewTransactions")
+ @Log(title = "瀹㈡埛寰�鏉�", businessType = BusinessType.OTHER)
+ @Operation(summary = "瀹㈡埛寰�鏉�")
+ public R customewTransactions(Page page, String customerName) {
+ return R.ok(customerService.customewTransactions(page,customerName));
+ }
+
+ @GetMapping("/customewTransactionsDetails")
+ @Log(title = "瀹㈡埛寰�鏉ユ槑缁�", businessType = BusinessType.OTHER)
+ @Operation(summary = "瀹㈡埛寰�鏉ユ槑缁�")
+ public R customewTransactionsDetails(Page page, Long customerId) {
+ return R.ok(customerService.customewTransactionsDetails(page,customerId));
+ }
+
+ @PostMapping("/saveReceiptPayment")
+ @Log(title = "鏂板鍥炴", businessType = BusinessType.INSERT)
+ @Operation(summary = "鏂板鍥炴")
+ public R saveReceiptPayment(@RequestBody SaveReceiptPaymentDto dto) {
+ return R.ok(accountSalesCollectionService.saveReceiptPayment(dto));
+ }
+
}
--
Gitblit v1.9.3