修改代码

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/PageDataVO.java

@@ -34,10 +34,9 @@ public  class PageDataVO<T> {
         return pageDataVo;
     }
 
-    public static <M> PageDataVO<M> pageInfo(Integer page, Integer limit, List<M> list){
-        PageHelper.startPage(page,limit);
-        PageInfo<M> listPageInfo = new PageInfo<M>(list);
-        return pageInfo(listPageInfo);
+    public static <M> PageDataVO<M> pageInfo(List<M> list){
+        PageInfo<M> pageInfo = new PageInfo<M>(list);
+        return PageDataVO.pageInfo(pageInfo);
     }
 
 }

xx-common/xx-common-platform-web/pom.xml

@@ -53,6 +53,11 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.3.4</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.10</version>
+        </dependency>
         <!-- druid -->
         <dependency>
             <groupId>com.github.drtrang</groupId>

xx-common/xx-common-platform/pom.xml

@@ -48,11 +48,6 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.10</version>
-        </dependency>
 
         <!-- excel 组件 -->
         <dependency>

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.rest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.PageHelper;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
@@ -69,7 +70,8 @@ public class BaseOrderController extends CommonBaseController {
         }
         dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
         Query query = new Query(dto);
-        return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query.getPage(), query.getLimit(), baseOrderBiz.pageByParm(query.getSuper())));
+        PageHelper.startPage(query.getPage(),query.getLimit());
+        return new ObjectRestResponse<>().data(PageDataVO.pageInfo(baseOrderBiz.pageByParm(query.getSuper())));
     }
 
     @ApiOperation("订单详情")
@@ -81,17 +83,23 @@ public class BaseOrderController extends CommonBaseController {
         if(StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
+        Query query = initQuery(no);
+        PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(baseOrderBiz.pageByParm(query.getSuper()));
+        if(page.getData().isEmpty()) {
+            throw new BaseException(ResultCode.NOTEXIST_CODE);
+        }
+        return new ObjectRestResponse<>().data(page.getData().get(0));
+    }
+
+    private Query initQuery(String no) {
         QueryOrderDetailDTO qodd = new QueryOrderDetailDTO();
         qodd.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
         qodd.setNo(no);
         qodd.setLimit(1);
         qodd.setPage(1);
         Query query = new Query(qodd);
-        PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query.getPage(), query.getLimit(), baseOrderBiz.pageByParm(query.getSuper()));
-        if(page.getData().isEmpty()) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE);
-        }
-        return new ObjectRestResponse<>().data(page.getData().get(0));
+        PageHelper.startPage(query.getPage(),query.getLimit());
+        return query;
     }
 
     @RequestMapping(value = "/pay",method = RequestMethod.POST)

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

 package com.xxfc.platform.tour.biz;
 
+import com.github.pagehelper.PageHelper;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ListRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -29,13 +30,18 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper,TourGood> {
     private TourGoodMapper tourGoodMapper;
 
     public PageDataVO<TourGood> getGoodList(int page, int limit , String query , Double latitude, Double longitude, Integer tagId, Double distance){
+        Map<String, Object> params = initParam(page, limit, query, latitude, longitude, tagId, distance);
+        return  PageDataVO.pageInfo(mapper.getGoodList(params));
+    }
+
+    private Map<String, Object> initParam(int page, int limit, String query, Double latitude, Double longitude, Integer tagId, Double distance) {
         Map<String,Object> params = new HashMap<String,Object>();
         params.put("query",query);
         params.put("latitude",latitude);
         params.put("longitude",longitude);
         params.put("tagId",tagId);
         params.put("distance",distance);
-//        List<TourGood> list = tourGoodMapper.getGoodList(params);
-        return  PageDataVO.pageInfo(page, limit, mapper.getGoodList(params));
+        PageHelper.startPage(page,limit);
+        return params;
     }
 }
\ No newline at end of file