From 0c8ebfdef57a5a11bc7385e57be93cde0e51e456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 12 Jul 2024 15:31:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E7=9B=8A=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserMoneyServiceImpl.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java index 9cb4701..c6988e8 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java @@ -156,16 +156,19 @@ public class UserMoneyServiceImpl extends ServiceImpl i } //收益明细 @Override - public Result profitDetailed(Long userId, IPage page1, String startTime,String endTime) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("artificer_id", userId); - queryWrapper.between("end_times", startTime, endTime); - //只查询已完成和待评价的订单 - queryWrapper.in("status", Arrays.asList(5, 3)); - //只查询根节点数据 - queryWrapper.eq("parent_id", 0); - queryWrapper.orderByDesc("end_times"); - IPage page2 = ordersDao.selectPage(page1, queryWrapper); + public Result profitDetailed(Long userId, Page page, String startTime,String endTime) { +// QueryWrapper queryWrapper = new QueryWrapper(); +// queryWrapper.eq("artificer_id", userId); +// queryWrapper.between("end_times", startTime, endTime); +// //只查询已完成和待评价的订单 +// queryWrapper.in("status", Arrays.asList(5, 3)); +// //只查询根节点数据 +// queryWrapper.eq("parent_id", 0); +// queryWrapper.orderByDesc("end_times"); +// IPage page2 = ordersDao.selectPage(page1, queryWrapper); + + IPage page2 = ordersDao.selectDividedIntoDetails(page, userId,startTime,endTime,null); + //分成明细添加到返回对象中 return Result.success().put("data", page2); }