|
@@ -1394,12 +1394,13 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
public BasePageResult<SysPremiumDetailsVo> getCommissionInfo(CommissionInfoDto commissionInfoDto) {
|
|
public BasePageResult<SysPremiumDetailsVo> getCommissionInfo(CommissionInfoDto commissionInfoDto) {
|
|
|
List<SysPremiumDetailsVo> list = new ArrayList<>();
|
|
List<SysPremiumDetailsVo> list = new ArrayList<>();
|
|
|
String userId = BaseController.getUserId();
|
|
String userId = BaseController.getUserId();
|
|
|
|
|
+ int pageNum = commissionInfoDto.getPageNum();
|
|
|
//int offset = (page - 1) * size;
|
|
//int offset = (page - 1) * size;
|
|
|
commissionInfoDto.setPageNum( (commissionInfoDto.getPageNum() -1) * commissionInfoDto.getPageSize());
|
|
commissionInfoDto.setPageNum( (commissionInfoDto.getPageNum() -1) * commissionInfoDto.getPageSize());
|
|
|
|
|
|
|
|
List<Map<String, Object>> stringObjectList = sysPremiumDetailsMapper.queryInfoPage(userId, commissionInfoDto);
|
|
List<Map<String, Object>> stringObjectList = sysPremiumDetailsMapper.queryInfoPage(userId, commissionInfoDto);
|
|
|
|
|
|
|
|
- if (CollectionUtil.isEmpty(stringObjectList)) return new BasePageResult<>(commissionInfoDto.getPageNum(), commissionInfoDto.getPageSize(), 0L, 0L,
|
|
|
|
|
|
|
+ if (CollectionUtil.isEmpty(stringObjectList)) return new BasePageResult<>(pageNum, commissionInfoDto.getPageSize(), 0L, 0L,
|
|
|
list);
|
|
list);
|
|
|
Map<String, List<SysPremiumDetails>> listMap = new HashMap<>();
|
|
Map<String, List<SysPremiumDetails>> listMap = new HashMap<>();
|
|
|
for (Map<String, Object> stringObjectMap : stringObjectList) {
|
|
for (Map<String, Object> stringObjectMap : stringObjectList) {
|
|
@@ -1472,8 +1473,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// List<SysPremiumDetailsVo> collect = list.stream().limit(page.getSize()).collect(Collectors.toList());
|
|
// List<SysPremiumDetailsVo> collect = list.stream().limit(page.getSize()).collect(Collectors.toList());
|
|
|
- long l = (list.size()+commissionInfoDto.getPageNum()-1)/commissionInfoDto.getPageSize();
|
|
|
|
|
- return new BasePageResult<>(commissionInfoDto.getPageNum(), commissionInfoDto.getPageSize(), list.size(), l,
|
|
|
|
|
|
|
+ long l = (list.size()+pageNum-1)/commissionInfoDto.getPageSize();
|
|
|
|
|
+ return new BasePageResult<>(pageNum, commissionInfoDto.getPageSize(), list.size(), l,
|
|
|
list);
|
|
list);
|
|
|
}
|
|
}
|
|
|
|
|
|