收益明细
This commit is contained in:
parent
e58c618f13
commit
0c8ebfdef5
|
@ -156,16 +156,19 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
|
||||||
}
|
}
|
||||||
//收益明细
|
//收益明细
|
||||||
@Override
|
@Override
|
||||||
public Result profitDetailed(Long userId, IPage page1, String startTime,String endTime) {
|
public Result profitDetailed(Long userId, Page page, String startTime,String endTime) {
|
||||||
QueryWrapper<Orders> queryWrapper = new QueryWrapper();
|
// QueryWrapper<Orders> queryWrapper = new QueryWrapper();
|
||||||
queryWrapper.eq("artificer_id", userId);
|
// queryWrapper.eq("artificer_id", userId);
|
||||||
queryWrapper.between("end_times", startTime, endTime);
|
// queryWrapper.between("end_times", startTime, endTime);
|
||||||
//只查询已完成和待评价的订单
|
// //只查询已完成和待评价的订单
|
||||||
queryWrapper.in("status", Arrays.asList(5, 3));
|
// queryWrapper.in("status", Arrays.asList(5, 3));
|
||||||
//只查询根节点数据
|
// //只查询根节点数据
|
||||||
queryWrapper.eq("parent_id", 0);
|
// queryWrapper.eq("parent_id", 0);
|
||||||
queryWrapper.orderByDesc("end_times");
|
// queryWrapper.orderByDesc("end_times");
|
||||||
IPage<Orders> page2 = ordersDao.selectPage(page1, queryWrapper);
|
// IPage<Orders> page2 = ordersDao.selectPage(page1, queryWrapper);
|
||||||
|
|
||||||
|
IPage<Orders> page2 = ordersDao.selectDividedIntoDetails(page, userId,startTime,endTime,null);
|
||||||
|
|
||||||
//分成明细添加到返回对象中
|
//分成明细添加到返回对象中
|
||||||
return Result.success().put("data", page2);
|
return Result.success().put("data", page2);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue