From af51a23a0d813dc3acd67538bb759bd777ef990d Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Sun, 18 Jan 2026 12:13:11 +0800 Subject: [PATCH] =?UTF-8?q?1=E6=9C=8818=E6=97=A5=EF=BC=8C=E4=B8=9A?= =?UTF-8?q?=E7=BB=A9=E5=BD=92=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/cash/CashCollectionController.java | 2 +- .../java/com/example/demo/service/cash/CashCollectionService.java | 3 ++- .../com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java | 5 +++-- 3 files changed, 6 insertions(+), 4 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 5edd41f..1cdfab4 100644 --- a/src/main/java/com/example/demo/controller/cash/CashCollectionController.java +++ b/src/main/java/com/example/demo/controller/cash/CashCollectionController.java @@ -286,7 +286,7 @@ public class CashCollectionController { convertTranslatedPerformanceFieldsToChinese(page.getPerformanceVO(), languageCode); } - Result result = Result.success(cashCollectionService.performanceSelect(page.getPageNum(), page.getPageSize(), page.getPerformanceVO())); + Result result = Result.success(cashCollectionService.performanceSelect(page.getPageNum(), page.getPageSize(), page.getPerformanceDTO())); // 对返回结果进行多语言转换 if (result.getCode() == 200 && result.getData() instanceof PageInfo) { diff --git a/src/main/java/com/example/demo/service/cash/CashCollectionService.java b/src/main/java/com/example/demo/service/cash/CashCollectionService.java index f4146e6..30f5603 100644 --- a/src/main/java/com/example/demo/service/cash/CashCollectionService.java +++ b/src/main/java/com/example/demo/service/cash/CashCollectionService.java @@ -1,5 +1,6 @@ package com.example.demo.service.cash; +import com.example.demo.domain.DTO.PerformanceDTO; import com.example.demo.domain.entity.CashRecord; import com.example.demo.domain.entity.GOrder; import com.example.demo.domain.entity.RechargeActivity; @@ -45,6 +46,6 @@ public interface CashCollectionService { //同步事务方法 void processBatch(List gOrders); - PageInfo performanceSelect(Integer pageNum, Integer pageSize, PerformanceVO performanceDTO); + PageInfo performanceSelect(Integer pageNum, Integer pageSize, PerformanceDTO performanceDTO); } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 7790a5d..32d8740 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -3,6 +3,7 @@ package com.example.demo.serviceImpl.cash; import com.example.demo.Util.JWTUtil; import com.example.demo.Util.LanguageTranslationUtil; import com.example.demo.config.RabbitMQConfig; +import com.example.demo.domain.DTO.PerformanceDTO; import com.example.demo.domain.entity.*; import com.example.demo.domain.vo.cash.CashCollection; import com.example.demo.domain.vo.cash.CashCollectionMessage; @@ -514,9 +515,9 @@ public User getNameAndMarket(Integer jwcode) { //多条件查询收款订单列表 @Override - public PageInfo performanceSelect(Integer pageNum, Integer pageSize, PerformanceVO performanceVO) { + public PageInfo performanceSelect(Integer pageNum, Integer pageSize, PerformanceDTO performanceDTO) { PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper - List performanceVOs = cashCollectionMapper.performanceSelect(performanceVO); + List performanceVOs = cashCollectionMapper.performanceSelect(performanceDTO); return new PageInfo<>(performanceVOs); }