修

src/main/java/com/fdkankan/manage/controller/InvoiceController.java

@@ -5,6 +5,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.service.IExcelService;
 import com.fdkankan.manage.service.IInvoiceService;
@@ -41,7 +42,7 @@ public class InvoiceController {
      **/
     @PostMapping("/pageInvoice")
     public ResultData pageInvoice(@RequestBody InvoicePageParamVO param){
-        return ResultData.ok( invoiceService.pageInvoice(param));
+        return ResultData.ok(PageInfo.PageInfo(invoiceService.pageInvoice(param)));
     }
 
     /**

src/main/java/com/fdkankan/manage/controller/NewsController.java

@@ -3,6 +3,7 @@ package com.fdkankan.manage.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.entity.News;
 import com.fdkankan.manage.service.INewsService;
@@ -38,7 +39,7 @@ public class NewsController {
      */
     @PostMapping("/pageNews")
     public ResultData pageNews(@RequestBody PageNewsParamVO param){
-        return ResultData.ok(newsService.pageNews(param));
+        return ResultData.ok(PageInfo.PageInfo(newsService.pageNews(param)));
     }
 
     /**

src/main/java/com/fdkankan/manage/service/IInvoiceService.java

@@ -1,13 +1,14 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.entity.Invoice;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
-
+import com.fdkankan.manage.vo.InvoiceVO;
 import java.io.IOException;
-
+import java.util.List;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -21,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface IInvoiceService extends IService<Invoice> {
 
-    PageInfo pageInvoice(InvoicePageParamVO param);
+    Page<InvoiceVO> pageInvoice(InvoicePageParamVO param);
 
     ResultData invoiceRegister(Long userId, Long id, String invoiceNum,
         String shipNum,MultipartFile file) throws IOException;

src/main/java/com/fdkankan/manage/service/INewsService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.entity.News;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -9,8 +9,11 @@ import com.fdkankan.manage.vo.NewsDisplayParamVO;
 import com.fdkankan.manage.vo.NewsPublicParamVO;
 import com.fdkankan.manage.vo.NewsPutTopParamVO;
 import com.fdkankan.manage.vo.PageNewsParamVO;
+import com.fdkankan.manage.vo.PageNewsVO;
 import com.fdkankan.manage.vo.SaveNewsParamVO;
 import com.fdkankan.manage.vo.UpdateNewsParamVO;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -22,7 +25,7 @@ import com.fdkankan.manage.vo.UpdateNewsParamVO;
  */
 public interface INewsService extends IService<News> {
 
-    PageInfo pageNews(PageNewsParamVO param);
+    Page<PageNewsVO> pageNews(PageNewsParamVO param);
 
     ResultData display(Long userId, NewsDisplayParamVO param);
 

src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java

@@ -1,12 +1,17 @@
 package com.fdkankan.manage.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.InvoiceType;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.common.response.Result;
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.manage.common.Dict;
 import com.fdkankan.manage.entity.Invoice;
@@ -15,12 +20,15 @@ import com.fdkankan.manage.mapper.IInvoiceMapper;
 import com.fdkankan.manage.service.IInvoiceRegisterService;
 import com.fdkankan.manage.service.IInvoiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.IOrderService;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
 import com.fdkankan.manage.vo.InvoiceRegisterDetailVO;
 import com.fdkankan.manage.vo.InvoiceVO;
-
+import java.io.File;
 import java.io.IOException;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -56,9 +64,8 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
 
     @Dict
     @Override
-    public PageInfo pageInvoice(InvoicePageParamVO param) {
-        Page<InvoiceVO> invoiceVOPage = baseMapper.pageInvoice(new Page(param.getPageNum(), param.getPageSize()), param);
-        return PageInfo.PageInfo(invoiceVOPage);
+    public Page<InvoiceVO> pageInvoice(InvoicePageParamVO param) {
+        return baseMapper.pageInvoice(new Page(param.getPageNum(), param.getPageSize()), param);
     }
 
     @Override

src/main/java/com/fdkankan/manage/service/impl/NewsServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.common.response.Result;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.entity.News;
 import com.fdkankan.manage.mapper.INewsMapper;
@@ -34,10 +35,10 @@ import org.springframework.stereotype.Service;
 public class NewsServiceImpl extends ServiceImpl<INewsMapper, News> implements INewsService {
 
     @Override
-    public PageInfo pageNews(PageNewsParamVO param) {
+    public Page<PageNewsVO> pageNews(PageNewsParamVO param) {
         Page<PageNewsVO> pageNewsVOPage =
             this.baseMapper.pageNews(new Page<>(param.getPageNum(), param.getPageSize()), param);
-        return PageInfo.PageInfo(pageNewsVOPage);
+        return pageNewsVOPage;
     }
 
     @Override