diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java index 7ce39c5..560d22f 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java @@ -31,9 +31,10 @@ public class AdminOrderController extends BaseController { public JSONObject olist(@RequestParam(value = "current_page",defaultValue = "1") String spage){ int ipage = Integer.valueOf(spage); List orderList=orderService.getAllOrderList(ipage); + int total = orderService.countAllOrder(); jsonObject.put("current_page",spage); jsonObject.put("per_page", ChConstant.PAGESIZE); - jsonObject.put("total",0); + jsonObject.put("total",total); jsonObject.put("code",200); jsonObject.put("data",orderList); jsonObject.put("msg","成功"); diff --git a/src/main/java/cn/chjyj/szwh/service/OrderService.java b/src/main/java/cn/chjyj/szwh/service/OrderService.java index 648cbbb..ea1227b 100644 --- a/src/main/java/cn/chjyj/szwh/service/OrderService.java +++ b/src/main/java/cn/chjyj/szwh/service/OrderService.java @@ -51,4 +51,10 @@ public interface OrderService { * @return */ int shutOrder(String batchcode); + + /** + * 统计订单总数 + * @return + */ + int countAllOrder(); } 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 b7ae783..9746424 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -59,4 +59,13 @@ public class OrderServiceImpl implements OrderService { String now = sdf.format(new Date()); return orderMapper.shutOrder(batchcode,now); } + + /** + * 统计所有订单总数 + * @return + */ + @Override + public int countAllOrder() { + return orderMapper.countAllOrder(); + } }