diff --git a/src/main/java/com/how2java/tmall/controller/OrderController.java b/src/main/java/com/how2java/tmall/controller/OrderController.java
index 5d2f424..21273a5 100644
--- a/src/main/java/com/how2java/tmall/controller/OrderController.java
+++ b/src/main/java/com/how2java/tmall/controller/OrderController.java
@@ -1,3 +1,56 @@
   	
+  	
 
 package com.how2java.tmall.controller;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.how2java.tmall.pojo.Order;
+import com.how2java.tmall.service.OrderItemService;
+import com.how2java.tmall.service.OrderService;
+import com.how2java.tmall.util.Page;
+
+
+@Controller
+@RequestMapping("")
+public class OrderController {
+    @Autowired
+    OrderService orderService;
+    @Autowired
+    OrderItemService orderItemService;
+
+    @RequestMapping("admin_order_list")
+    public String list(Model model, Page page){
+        PageHelper.offsetPage(page.getStart(),page.getCount());
+
+        List<Order> os= orderService.list();
+
+        int total = (int) new PageInfo<>(os).getTotal();
+        page.setTotal(total);
+
+        orderItemService.fill(os);
+
+        model.addAttribute("os", os);
+        model.addAttribute("page", page);
+
+        return "admin/listOrder";
+    }
+
+    @RequestMapping("admin_order_delivery")
+    public String delivery(Order o) throws IOException {
+        o.setDeliveryDate(new Date());
+        o.setStatus(OrderService.waitConfirm);
+        orderService.update(o);
+        return "redirect:admin_order_list";
+    }
+}
+