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 |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 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
new file mode 100644
index 0000000..1da2389
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
@@ -0,0 +1,50 @@
+package com.ruoyi.web.controller.api;
+
+
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+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;
+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;
+
+/**
+ * <p>
+ * 流水管理 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-17
+ */
+@RestController
+@RequestMapping("/t-flow-management")
+public class TFlowManagementController {
+    @Autowired
+    private TFlowManagementService flowService;
+    /**
+     * 获取流水列表
+     */
+    @PreAuthorize("@ss.hasPermi('flow:sys:detail:list')")
+    @ApiOperation(value = "获取流水列表")
+    @PostMapping("/list")
+    public R<PageInfo<TFlowManagement>> list(@RequestBody TFlowManagementQuery 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