autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 运营商查询订单报表接口数据加分页

Browse Source
This commit is contained in:
Lemon
2023-06-15 18:23:37 +08:00
parent 011876cb7e
commit fbcf65569a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/dto/MerchantOrderReportDTO.java
View File

@@ -13,5 +13,7 @@ public class MerchantOrderReportDTO {
private String merchantId;
private String startTime;
private String endTime;
private Integer pageNum;
private Integer pageSize;
}

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -105,6 +105,8 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
*/
@Override
public MerchantOrderReportVO getMerchantOrderReport(MerchantOrderReportDTO dto) {
int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize();
if (StringUtils.isBlank(dto.getStartTime())) {
dto.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)));
}
@@ -113,7 +115,7 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
}
MerchantOrderReportVO vo = new MerchantOrderReportVO();
MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport();
PageUtils.startPage(1, 10);
PageUtils.startPage(pageNum, pageSize);
List<SettleOrderReportVO> list = settleOrderReportMapper.getMerchantOrderReport(dto);
if (CollectionUtils.isEmpty(list)) {
return null;