临时修改暂定

YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -1,5 +1,6 @@
 package com.platform.yijia.controller;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.gson.Gson;
 import com.platform.yijia.param.request.LoginBody;
 import com.platform.yijia.pojo.PayOrder;
@@ -151,14 +152,19 @@ public class PosMachineController {
             payOrder.setEndTime(request.getEndTime());
             payOrder.setPayType(request.getPayType());
             payOrder.setStatus("1");
+            Map<String, Object> resultMap = new HashMap<>();
             //分页
             if(request.getPageNum() !=null && request.getPageSize() !=null){
                 PageHelper.startPage(request.getPageNum(), request.getPageSize());
+                List<PayOrder> payOrderList = payOrderService.selectPayOrderList(payOrder);
+                PageInfo pageInfo = new PageInfo(payOrderList);
+                //resultMap.put("listSum", pageInfo);
+                resultData = ResultData.success(pageInfo);
+            }else {
+                List<PayOrder> payOrderList = payOrderService.selectPayOrderList(payOrder);
+                resultMap.put("listSum", payOrderList);
+                resultData = ResultData.success(resultMap);
             }
-            List<PayOrder> payOrderList = payOrderService.selectPayOrderList(payOrder);
-            Map<String, Object> resultMap = new HashMap<>();
-            resultMap.put("listSum", payOrderList);
-            resultData = ResultData.success(resultMap);
         }else {
             resultData = ResultData.error(CodeMsg.PARAMS_NUll);
         }