From 27c39a70946f9b1f8570ae7ed4ec7f1bbef278b9 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Wed, 12 Nov 2025 11:00:57 +0800 Subject: [PATCH] =?UTF-8?q?11.11=20=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/cash/CashCollectionController.java | 15 +++++++++++++++ .../demo/serviceImpl/coin/ExportExcelServiceImpl.java | 5 ++++- src/main/resources/mapper/AuditMapper.xml | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java index cb79b6e..1ada80c 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -111,6 +111,21 @@ public class CashCollectionController { return Result.error(e.getMessage()); }} + @PostMapping("/export") + public Result export(@RequestBody Page page) throws Exception { + try { + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } + return Result.success(cashCollectionService.selectCollection(page.getPageNum(), page.getPageSize(),page.getCashCollection())); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + } + //补全手续费等 @PostMapping("/complete") public Result complete(@RequestBody CashCollection cashRecord) { diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index 0b4b6d0..085b42a 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -8,6 +8,7 @@ import com.example.demo.Util.ExcelUploadUtil; import com.example.demo.Util.JWTUtil; import com.example.demo.controller.bean.BeanConsumeController; import com.example.demo.controller.bean.BeanRechargeController; +import com.example.demo.controller.cash.CashCollectionController; import com.example.demo.controller.cash.CashRefundController; import com.example.demo.controller.coin.ConsumeController; import com.example.demo.controller.coin.GoldDetailController; @@ -85,6 +86,8 @@ public class ExportExcelServiceImpl implements ExportExcelService { private AuthenticationManager authenticationManager; @Autowired private CashRefundController cashRefundController; + @Autowired + private CashCollectionController cashCollectionController; // 每页查询的数据量 private static final int PAGE_SIZE = 5000; @Autowired @@ -294,7 +297,7 @@ public class ExportExcelServiceImpl implements ExportExcelService { JsonNode beanRechargeNode = requestDataNode.path("cashCollection"); CashCollection cashCollection = objectMapper.treeToValue(beanRechargeNode, CashCollection.class); page.setCashCollection(cashCollection); - return cashRefundController.export(page); + return cashCollectionController.export(page); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 1971aa2..07ef448 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -169,7 +169,7 @@ select admin_name from admin where id = #{auditId} - select id, admin_name from admin