From 193fa58b2e22cfa078116e080effccc0bf3e1538 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 7 Jul 2023 11:44:36 +0800 Subject: [PATCH] update --- .../jsowell/web/controller/pile/OrderBasicInfoController.java | 1 - .../src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java | 4 ++++ .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index d445aa540..67d902d53 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -156,7 +156,6 @@ public class OrderBasicInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('order:order:list')") @PostMapping("/getMerchantOrderList") public TableDataInfo getMerchantOrderList(@RequestBody QueryOrderDTO dto) { - PageUtils.startPage(); return getDataTable(orderBasicInfoService.getMerchantOrderInfoList(dto)); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java index 8e41fa315..b648563c6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java @@ -63,4 +63,8 @@ public class QueryOrderDTO extends BaseEntity { * 结束时间 */ private String endTime; + + private int pageSize; + + private int pageNum; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 7968050f5..bff689a09 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1987,11 +1987,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { */ @Override public List getMerchantOrderInfoList(QueryOrderDTO dto) { + int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum(); + int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize(); String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)); startTime = dto.getStartTime() == null ? startTime : dto.getStartTime(); dto.setStartTime(startTime); + PageUtils.startPage(pageNum, pageSize); return orderBasicInfoMapper.getMerchantOrderInfoList(dto); } }