From fbcf65569ac96a02b53d2fabff9ac2ae51e65aff Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 15 Jun 2023 18:23:37 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E8=BF=90=E8=90=A5=E5=95=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E6=8A=A5=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/pile/dto/MerchantOrderReportDTO.java | 2 ++ .../pile/service/impl/SettleOrderReportServiceImpl.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/MerchantOrderReportDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/MerchantOrderReportDTO.java index ae67eb421..39207bbf1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/MerchantOrderReportDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/MerchantOrderReportDTO.java @@ -13,5 +13,7 @@ public class MerchantOrderReportDTO { private String merchantId; private String startTime; private String endTime; + private Integer pageNum; + private Integer pageSize; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 85e0a7928..d4749d698 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -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 list = settleOrderReportMapper.getMerchantOrderReport(dto); if (CollectionUtils.isEmpty(list)) { return null;