From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
index 51a106c..1da2389 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
@@ -6,6 +6,7 @@
import com.ruoyi.system.model.TFlowManagement;
import com.ruoyi.system.query.TFlowManagementQuery;
import com.ruoyi.system.service.TFlowManagementService;
+import com.ruoyi.system.vo.TFlowManagementStatisticsVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,13 +32,19 @@
/**
* 获取流水列表
*/
- @PreAuthorize("@ss.hasPermi('system:flow:list')")
+ @PreAuthorize("@ss.hasPermi('flow:sys:detail:list')")
@ApiOperation(value = "获取流水列表")
@PostMapping("/list")
public R<PageInfo<TFlowManagement>> list(@RequestBody TFlowManagementQuery query) {
- PageInfo<TFlowManagement> list = flowService.pageList(query);
return R.ok(flowService.pageList(query));
}
+ @ApiOperation(value = "根据支付方式统计流水金额")
+ @PostMapping("/getPaymentStats")
+ public R<TFlowManagementStatisticsVo> getPaymentStats(@RequestBody TFlowManagementQuery query){
+ return R.ok(flowService.getPaymentStats(query));
+ }
+
+
}
--
Gitblit v1.7.1