From 4791c1ed4ac9d21776143d8afc408032850704d8 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 16 Jun 2023 09:13:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=BF=90=E8=90=A5=E5=95=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E6=8A=A5=E8=A1=A8=E5=81=9A=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SettleOrderReportServiceImpl.java      | 17 ++++++++++++++---
 .../pile/vo/web/MerchantOrderReportVO.java      |  5 ++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

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 d4749d698..7ab599282 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
@@ -1,6 +1,7 @@
 package com.jsowell.pile.service.impl;
 
 import com.github.pagehelper.PageInfo;
+import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
@@ -105,8 +106,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();
+        int pageNum = dto.getPageNum() == null ? 1 : dto.getPageNum();
+        int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
         if (StringUtils.isBlank(dto.getStartTime())) {
             dto.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)));
         }
@@ -122,7 +123,17 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService {
         }
         PageInfo<SettleOrderReportVO> pageInfo = new PageInfo<>(list);
         vo.setMerchantId(dto.getMerchantId());
-        vo.setReportList(pageInfo.getList());
+        // vo.setReportList(pageInfo.getList());
+
+        PageResponse pageResponse = PageResponse.builder()
+                .pageSize(pageSize)
+                .pageNum(pageNum)
+                .pages(pageInfo.getPages())
+                .total(pageInfo.getTotal())
+                .list(pageInfo.getList())
+
+                .build();
+        vo.setPageResponse(pageResponse);
         // 进行数据汇总
         // 用电度数
         report.setUseElectricity(list.stream().map(SettleOrderReportVO::getUseElectricity).reduce(BigDecimal.ZERO, BigDecimal::add));
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java
index 8e1565b19..a0763c8f8 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportVO.java
@@ -1,5 +1,6 @@
 package com.jsowell.pile.vo.web;
 
+import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.pile.domain.SettleOrderReport;
 import lombok.Data;
 
@@ -12,7 +13,9 @@ public class MerchantOrderReportVO {
 
     private MerchantOrderReport merchantOrderReport;
 
-    private List<SettleOrderReportVO> reportList;
+    // private List<SettleOrderReportVO> reportList;
+
+    private PageResponse pageResponse;
 
    @Data
    public static class MerchantOrderReport{