diff --git a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java index e52f9bd..5c85a83 100644 --- a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java +++ b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java @@ -65,10 +65,11 @@ public class OrderController extends BaseController { int ipage = Integer.valueOf(page); int ips = Integer.valueOf(pagesize); int startrs = ipage > 0 ? (ipage - 1) * ips : 0; - List olist =orderService.getOrderList(qmap, startrs, ips); + //List olist =orderService.getOrderList(qmap, startrs, ips); + Map outmap = orderService.getOrderList(qmap,startrs,ips); //赋值 jsonObject.put("code","200"); - jsonObject.put("data",olist); + jsonObject.put("data",outmap); jsonObject.put("msg","success"); jsonObject.put("page",page); jsonObject.put("limit",pagesize); diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java index 6016d8b..99cd213 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -47,7 +47,7 @@ public class OrderServiceImpl implements OrderService { retmap.put("start",starrs+1); retmap.put("cur_page",page); retmap.put("end",page*limit); - retmap.put("start",starrs); + retmap.put("id",starrs); retmap.put("per_page",limit); retmap.put("data",orderList); return retmap; diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml index b9a9c48..29b6f09 100644 --- a/src/main/resources/mapper/szwh/OrderMapper.xml +++ b/src/main/resources/mapper/szwh/OrderMapper.xml @@ -57,15 +57,15 @@ - + ${k} = #{v} + + ${k}>#{v} + - - and id>#{map.startrs} - - and id>#{startRs} limit #{pageSize} + limit #{pageSize}