From 2503b67b692174a8126d56d9d6ee14328ff84385 Mon Sep 17 00:00:00 2001
From: istars <drwangmingxing@163.com>
Date: Tue, 15 Jan 2019 22:00:16 +0800
Subject: [PATCH] myOrders.html

---
 .../order/controller/orderController.java     | 79 ++++++++++---------
 .../demo/order/controller/showController.java |  2 +-
 .../order/service/impl/orderServiceImpl.java  |  1 +
 demo/src/main/resources/static/myOrders.html  |  5 +-
 4 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/demo/src/main/java/com/example/demo/order/controller/orderController.java b/demo/src/main/java/com/example/demo/order/controller/orderController.java
index c1c89ae..c310c7f 100644
--- a/demo/src/main/java/com/example/demo/order/controller/orderController.java
+++ b/demo/src/main/java/com/example/demo/order/controller/orderController.java
@@ -1,39 +1,40 @@
-package com.example.demo.order.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.example.demo.bean.Audit;
-import com.example.demo.bean.User;
-import com.example.demo.order.service.impl.orderServiceImpl;
-import com.example.demo.order.service.orderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-@RestController
-public class orderController extends HttpServlet {
-    @Autowired
-    private orderServiceImpl orderService;
-
-    @RequestMapping(value = "/orderlist",method = RequestMethod.POST)
-    public void orderList(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        response.setContentType("text/html;charset=utf-8");
-        HttpSession session = request.getSession();
-        User user = new User();
-        user = (User) session.getAttribute("user");
-        long userNum = user.getUserNum();
-        List<Audit> list = orderService.selectAuditByUserNum(userNum);
-        String json = JSONObject.toJSONString(list);
-        System.out.println(json);
-        response.getWriter().print(json);
-    }
-}
+//package com.example.demo.order.controller;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.example.demo.bean.Audit;
+//import com.example.demo.bean.User;
+//import com.example.demo.order.service.impl.orderServiceImpl;
+//import com.example.demo.order.service.orderService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.servlet.ServletException;
+//import javax.servlet.http.HttpServlet;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import javax.servlet.http.HttpSession;
+//import java.io.IOException;
+//import java.util.ArrayList;
+//import java.util.List;
+//@RestController
+//public class orderController{
+//    @Autowired
+//    private orderServiceImpl orderService;
+//
+//    @RequestMapping(value = "/orderlist",method = RequestMethod.POST)
+//    public List<Audit> orderList(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+//        response.setContentType("text/html;charset=utf-8");
+//        HttpSession session = request.getSession();
+//        User user = new User();
+//        user = (User) session.getAttribute("user");
+//        long userNum = user.getUserNum();
+//        List<Audit> list = orderService.selectAuditByUserNum(userNum);
+////        String json = JSONObject.toJSONString(list);
+////        System.out.println(json);
+////        response.getWriter().print(json);
+//        return list;
+//    }
+//}
diff --git a/demo/src/main/java/com/example/demo/order/controller/showController.java b/demo/src/main/java/com/example/demo/order/controller/showController.java
index 9b19fd6..66126ff 100644
--- a/demo/src/main/java/com/example/demo/order/controller/showController.java
+++ b/demo/src/main/java/com/example/demo/order/controller/showController.java
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpSession;
 import java.util.List;
 
 /*
-打印出所以的订单
+打印出所有的订单
  */
 
 //@Controller
diff --git a/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java b/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java
index c737939..8385d12 100644
--- a/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java
+++ b/demo/src/main/java/com/example/demo/order/service/impl/orderServiceImpl.java
@@ -10,6 +10,7 @@ import java.util.List;
 public class orderServiceImpl implements orderService {
     @Autowired
     public auditMapper auditMapper;
+    @Override
     public List<Audit> selectAuditByUserNum(long userNum){
         return auditMapper.selectAuditByUserNum(userNum);
     }
diff --git a/demo/src/main/resources/static/myOrders.html b/demo/src/main/resources/static/myOrders.html
index bae0a61..07c8bd7 100644
--- a/demo/src/main/resources/static/myOrders.html
+++ b/demo/src/main/resources/static/myOrders.html
@@ -13,7 +13,7 @@
         <script type="text/javascript">
             $(document).ready(function () {
                 $.ajax({
-                    url: "/orderlist",
+                    url: "/order",
                     type: "post",
                     dataType: "json",
                     success: function(data){
@@ -30,6 +30,7 @@
 
             //展示数据
             function showData(data) {
+                $("#userNum").html(data[1].userNum)
                 $("#num").empty();
                 for (var i = 0; i < data.length; i++) {
                     var audit = data[i];
@@ -82,7 +83,7 @@
                             <img src="images/myOrders.png">
                         </div>
                         <div class="aui-flex-box">
-                            <h2>用户 <em>XXX</em></h2>
+                            <h2>用户 <em id="userNum">XXX</em></h2>
 </div>
                         <div class="aui-pri-button"> </div>
                     </div>