From ae7063f5e4a49e2ed55f240440246bdbae3fcc13 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 23 十二月 2025 11:59:00 +0800
Subject: [PATCH] feat:管理后台财务管理积分结算

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIntegralSettlementController.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIntegralSettlementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIntegralSettlementController.java
index db6e022..e4fd392 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIntegralSettlementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIntegralSettlementController.java
@@ -8,9 +8,10 @@
 import com.ruoyi.common.utils.WebUtils;
 import com.ruoyi.system.dto.TIntegralSettlementDTO;
 import com.ruoyi.system.export.IntegralSettlementImport;
-import com.ruoyi.system.model.TIntegralSettlement;
+import com.ruoyi.system.query.TIntegralSettlementDetailQuery;
 import com.ruoyi.system.query.TIntegralSettlementQuery;
 import com.ruoyi.system.service.TIntegralSettlementService;
+import com.ruoyi.system.vo.TIntegralSettlementDetailVO;
 import com.ruoyi.system.vo.TIntegralSettlementVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,14 +22,11 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 积分结算 前端控制器
@@ -46,7 +44,7 @@
     private final TIntegralSettlementService integralSettlementService;
 
     @ApiOperation(value = "积分结算列表(分页)")
-    @PostMapping("/pageList")
+    @PostMapping("/page-list")
     public R<Page<TIntegralSettlementVO>> pageList(@RequestBody TIntegralSettlementQuery query) {
         return R.ok(integralSettlementService.getSettlementPageList(query));
     }
@@ -81,4 +79,15 @@
         integralSettlementService.importData(file, dto);
         return R.ok();
     }
+    @ApiOperation("详情")
+    @GetMapping("/detail/{id}")
+    public R<TIntegralSettlementVO> detail(@PathVariable Integer id) {
+        return R.ok(integralSettlementService.getDetail(id));
+    }
+
+    @ApiOperation(value = "积分结算详情列表(分页)")
+    @PostMapping("/detail/page-list")
+    public R<Page<TIntegralSettlementDetailVO>> pageDetailList(@RequestBody TIntegralSettlementDetailQuery query) {
+        return R.ok(integralSettlementService.getSettlementDetailPageList(query));
+    }
 }

--
Gitblit v1.7.1