yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:409c436bc5e30c8ffe293f2c84f5b941c29e1eb5
Branches Tags
yangjun:master
..
compare: yangjun:e58c618f138de6a7c78cd4a31ac9b4c293494b8f
Branches Tags
yangjun:master

No commits in common. "409c436bc5e30c8ffe293f2c84f5b941c29e1eb5" and "e58c618f138de6a7c78cd4a31ac9b4c293494b8f" have entirely different histories.
409c436bc5 ... e58c618f13

3 changed files with 13 additions and 16 deletions
Show Stats Expand all files Collapse all files

4
src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java
View File

@ -183,8 +183,8 @@ public class AppUserMoneyController {
if(page == null){page = 1L;} if(page == null){page = 1L;}
if(limit == null){limit = 10L;} if(limit == null){limit = 10L;}
Page page1 = new Page(page, limit); IPage ipage = new Page(page, limit);
return userMoneyService.profitDetailed(artificer.getArtificerId(), page1,startTime,endTime); return userMoneyService.profitDetailed(artificer.getArtificerId(), ipage,startTime,endTime);
} }

2
src/main/java/com/sqx/modules/app/service/UserMoneyService.java
View File

@ -26,6 +26,6 @@ public interface UserMoneyService extends IService<UserMoney> {
PageUtils balanceDetailed(@RequestAttribute Long userId, Page<UserMoneyDetails> ipage); PageUtils balanceDetailed(@RequestAttribute Long userId, Page<UserMoneyDetails> ipage);
Result profitDetailed(@RequestAttribute Long userId, Page ipage, String startTime,String endTime); Result profitDetailed(@RequestAttribute Long userId, IPage ipage, String startTime,String endTime);
} }

23
src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java
View File

@ -156,19 +156,16 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
} }
//收益明细 //收益明细
@Override @Override
public Result profitDetailed(Long userId, Page page, String startTime,String endTime) { public Result profitDetailed(Long userId, IPage page1, 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);
} }