nearly complete

src/main/java/com/wyz/demo/controller/OrderController.java

@@ -5,7 +5,9 @@ import com.wyz.demo.service.OrderService;
 import com.wyz.demo.vo.CommonOrderVO;
 import com.wyz.demo.vo.DetailOrderVO;
 import com.wyz.demo.vo.SelfOrderVO;
+import com.wyz.demo.vo.SelfPickedOrderVO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,13 +25,22 @@ public class OrderController {
 
 
     /**
-     * 查询某个用户自己的订单
+     * 用来测试的接口
+     */
+    @RequestMapping(value = "/test", produces = "application/json")
+    public String test(@RequestBody String s){
+        return "hello:"+s;
+    }
+
+
+    /**
+     * 查询某个用户自己发起的订单
      */
     @RequestMapping(value = "/own", produces = "application/json")
     public List<SelfOrderVO> getOwnOrders(HttpSession sess){
         String username = (String)sess.getAttribute("username");
         if(username==null){
-            log.error("{session中没有用户名：还未登录}");
+            log.warn("[查看我的订单] : session中没有用户名：还未登录");
             return null;
         }else{
             List<SelfOrderVO> orders = orderService.getOrdersByUsername(username);
@@ -39,6 +50,22 @@ public class OrderController {
 
 
     /**
+     * 查询自己接的单子
+     */
+    @RequestMapping(value="/picked")
+    public List<SelfPickedOrderVO> getOwnPickedOrders(HttpSession sess){
+        String username = (String)sess.getAttribute("username");
+        if(username==null){
+            log.warn("[查看我的接单] : session中没有用户名：还未登录");
+            return null;
+        }else{
+            List<SelfPickedOrderVO> orders = orderService.getPickedOrdersByUsername(username);
+            return orders;
+        }
+    }
+
+
+    /**
      * 提交订单
      */
     @PostMapping(value = "/commit")
@@ -49,7 +76,7 @@ public class OrderController {
 
 
     /**
-     * 返回全部待接单的订单，在主页上显示
+     * 返回全部未接单的订单，在主页上显示
      */
     @RequestMapping(value = "/all")
     public List<CommonOrderVO> getAllUnpickOrders(){
@@ -69,12 +96,47 @@ public class OrderController {
 
 
     /**
-     * 接单
+     * 接单：只需要改订单的状态
      */
     @RequestMapping(value = "/pick")
     public void pickOrder(@RequestParam("orderId") int orderId, HttpSession sess){
         orderService.pickOrder(orderId, sess);
     }
 
+    /**
+     * 接单者-取消接单：只需要改订单的状态
+     */
+    @RequestMapping(value = "/cancelPicked")
+    public void cancelPickedOrder(@RequestParam("orderId") int orderId){
+        orderService.cancelPickedOrder(orderId);
+    }
+
+
+    /**
+     * 接单者-确认送达
+     */
+    @RequestMapping(value = "/confirmPicked")
+    public void confirmPickedOrder(@RequestParam("orderId") int orderId){
+        orderService.confirmPickedOrder(orderId);
+    }
+
+
+    /**
+     * 下单者-取消订单
+     */
+    @RequestMapping(value = "/cancel")
+    public void cancelOrder(@RequestParam("orderId") int orderId){
+        orderService.cancelOrder(orderId);
+    }
+
+    /**
+     * 下单者-确认完成
+     */
+    @RequestMapping(value = "/confirmCompleted")
+    public void confirmOrder(@RequestParam("orderId") int orderId){
+        orderService.confirmOrder(orderId);
+    }
+
+
 
 }

src/main/java/com/wyz/demo/dao/OrderRepository.java

@@ -8,9 +8,11 @@ import java.util.List;
 public interface OrderRepository {
 
 
-    // 根据用户id查订单
-    public List<OrderPO> getOrdersByUserId(int sender_id);
+    // 根据sender_id查订单
+    public List<OrderPO> getOrdersBySenderId(int sender_id);
 
+    // 根据receiver_id查订单
+    public List<OrderPO> getOrdersByReceiverId(int receiver_id);
 
     // 提交订单
     public void addOrder(OrderPO orderPO);
@@ -24,8 +26,23 @@ public interface OrderRepository {
     public OrderPO getOrderById(int id);
 
 
-    // 有用户接单
-    public void pickOrder(@Param("id") int order_id, @Param("receiver_id")int receiver_id);
+    // 接单
+    public void pickOrder(@Param("order_id") int order_id, @Param("receiver_id")int receiver_id);
 
+    // 取消接单
+    public void cancelPickedOrder(int order_id);
 
+    // 确认接单送达
+    public void confirmPickedOrder(int order_id);
+
+    /**
+     * 下单者-取消订单
+     */
+    void cancelOrder(int order_id);
+
+
+    /**
+     * 下单者-确认完成
+     */
+    void confirmOrder(int order_id);
 }

src/main/java/com/wyz/demo/service/OrderService.java

@@ -4,6 +4,7 @@ import com.wyz.demo.dto.OrderDTO;
 import com.wyz.demo.vo.CommonOrderVO;
 import com.wyz.demo.vo.DetailOrderVO;
 import com.wyz.demo.vo.SelfOrderVO;
+import com.wyz.demo.vo.SelfPickedOrderVO;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpSession;
@@ -12,10 +13,14 @@ import java.util.List;
 public interface OrderService {
 
     /**
-     * 获取某个用户自己的全部订单
+     * 获取某个用户自己发起的全部订单
      */
     public List<SelfOrderVO> getOrdersByUsername(String username);
 
+    /**
+     * 获取某个用户的全部接单
+     */
+    public List<SelfPickedOrderVO> getPickedOrdersByUsername(String username);
 
     /**
      * 提交订单
@@ -38,4 +43,30 @@ public interface OrderService {
      * 接单
      */
     public void pickOrder(int order_id, HttpSession sess);
+
+    /**
+     * 取消接单
+     * @param order_id
+     */
+    public void cancelPickedOrder(int order_id);
+
+    /**
+     * 接单确认送达
+     */
+    public void confirmPickedOrder(int order_id);
+
+    /**
+     * 下单者-取消订单
+     */
+    public void cancelOrder(int order_id);
+
+
+
+    /**
+     * 下单者-确认完成
+     */
+    public void confirmOrder(int order_id);
+
+
+
 }

src/main/java/com/wyz/demo/service/impl/OrderServiceImpl.java

@@ -9,6 +9,7 @@ import com.wyz.demo.service.OrderService;
 import com.wyz.demo.vo.CommonOrderVO;
 import com.wyz.demo.vo.DetailOrderVO;
 import com.wyz.demo.vo.SelfOrderVO;
+import com.wyz.demo.vo.SelfPickedOrderVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,19 +36,18 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public List<SelfOrderVO> getOrdersByUsername(String username) {
         int sender_id = userRepository.getIdByUsername(username);
-        List<OrderPO> orders = orderRepository.getOrdersByUserId(sender_id);
+        List<OrderPO> orders = orderRepository.getOrdersBySenderId(sender_id);
 
 
         List<SelfOrderVO> res = new ArrayList<>();
         for (OrderPO orderPO : orders) {
             SelfOrderVO orderVO = new SelfOrderVO();
 
+            orderVO.setId(orderPO.getId());
             orderVO.setTimestamp(orderPO.getTimestamp());
             orderVO.setDescription(orderPO.getDescription());
             orderVO.setPrice(orderPO.getPrice());
             String receiver = userRepository.getUsernameById(orderPO.getReceiverId());
-//            log.info("receiver-id:{}",orderPO.getReceiverId());
-//            log.info("receiver:{}",receiver);
             orderVO.setReceiver(receiver);
             orderVO.setStatus(orderPO.getStatus());
 
@@ -58,6 +58,33 @@ public class OrderServiceImpl implements OrderService {
         return res;
     }
 
+    /**
+     * 获取某个用户全部接单
+     * @param username
+     * @return
+     */
+    public List<SelfPickedOrderVO> getPickedOrdersByUsername(String username){
+        int receiver_id = userRepository.getIdByUsername(username);
+        List<OrderPO> orders = orderRepository.getOrdersByReceiverId(receiver_id);
+
+        List<SelfPickedOrderVO> res = new ArrayList<>();
+        for (OrderPO orderPO : orders) {
+            SelfPickedOrderVO orderVO = new SelfPickedOrderVO();
+
+            orderVO.setId(orderPO.getId());
+            orderVO.setTimestamp(orderPO.getTimestamp());
+            orderVO.setDescription(orderPO.getDescription());
+            orderVO.setPrice(orderPO.getPrice());
+            String sender = userRepository.getUsernameById(orderPO.getSenderId());
+            orderVO.setSender(sender);
+            orderVO.setStatus(orderPO.getStatus());
+
+            res.add(orderVO);
+        }
+        return res;
+    }
+
+
     @Override
     public void addOrder(OrderDTO orderDTO, HttpSession sess) {
 
@@ -125,5 +152,29 @@ public class OrderServiceImpl implements OrderService {
         orderRepository.pickOrder(order_id, receiver_id);
     }
 
+    @Override
+    public void cancelPickedOrder(int order_id) {
+        orderRepository.cancelPickedOrder(order_id);
+    }
+
+    @Override
+    public void confirmPickedOrder(int order_id) {
+        orderRepository.confirmPickedOrder(order_id);
+    }
+
+    /**
+     * 下单者-取消订单
+     */
+    public void cancelOrder(int order_id){
+        orderRepository.cancelOrder(order_id);
+    }
+
+    /**
+     * 下单者-确认完成
+     */
+    public void confirmOrder(int order_id){
+        orderRepository.confirmOrder(order_id);
+    }
+
 
 }

src/main/java/com/wyz/demo/service/impl/UserServiceImpl.java

@@ -116,6 +116,7 @@ public class UserServiceImpl implements UserService {
         }else{
             msg.setFlag(3);
             msg.setMsg("用户已经登录");
+            msg.setUsername((String)sess.getAttribute("username"));
         }
 
         return msg;

src/main/java/com/wyz/demo/vo/Message.java

@@ -7,4 +7,5 @@ import lombok.Data;
 public class Message {
     int flag;
     String msg;
+    String username;
 }

src/main/java/com/wyz/demo/vo/SelfOrderVO.java

@@ -7,6 +7,7 @@ import java.util.Date;
 
 @Data
 public class SelfOrderVO {
+    int id;
     Date timestamp;
     String description;
     int price;

src/main/java/com/wyz/demo/vo/SelfPickedOrderVO.java

@@ -0,0 +1,15 @@
+package com.wyz.demo.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SelfPickedOrderVO {
+    int id;
+    Date timestamp;
+    String description;
+    int price;
+    String sender;
+    String status;
+}

src/main/resources/mapper/OrderMapper.xml

@@ -18,22 +18,42 @@
          `price`,`status`,`comment`,`timestamp`)
         values
         (#{description},#{when},#{location},#{senderId},null,
-         #{price},"待接单",#{comment},now())
+         #{price},"未接单",#{comment},now())
     </insert>
 
 
     <update id="pickOrder">
-        update `order` set `receiver_id`=#{receiver_id},`status`="已接单"  where id=#{id}
+        update `order` set `receiver_id`=#{receiver_id}, `status`="已接单"  where id=#{order_id}
     </update>
 
+    <update id="cancelPickedOrder">
+        update `order` set `receiver_id`=null, `status`="未接单"  where id=#{order_id}
+    </update>
+
+    <update id="confirmPickedOrder">
+        update `order` set `status`="已送达"  where id=#{order_id}
+    </update>
+
+    <update id="confirmOrder">
+        update `order` set `status`="已完成"  where id=#{order_id}
+    </update>
+
+    <delete id="cancelOrder">
+        delete from `order` where id = #{order_id}
+    </delete>
 
-    <select id="getOrdersByUserId" resultMap="OrderMap" parameterType="int">
+
+    <select id="getOrdersBySenderId" resultMap="OrderMap" parameterType="int">
         select * from `order` where sender_id = #{sender_id}
     </select>
 
+    <select id="getOrdersByReceiverId" resultMap="OrderMap" parameterType="int">
+        select * from `order` where receiver_id = #{receiver_id}
+    </select>
+
 
     <select id="getAllUnpickOrders" resultMap="OrderMap">
-        select * from `order` where `status` = "待接单"
+        select * from `order` where `status` = "未接单"
     </select>
 
     <select id="getOrderById" resultMap="OrderMap">
@@ -41,7 +61,4 @@
     </select>
 
 
-
-
-
 </mapper>

src/main/resources/mybatis-config.xml

@@ -24,8 +24,8 @@
 
 
     <!-- 数据库配置 -->
-    <environments default="master">
-        <environment id="dev">
+    <environments default="dev">
+        <environment id="master">
             <transactionManager type="JDBC"/>
             <dataSource type="POOLED">
                 <property name="driver" value="com.mysql.cj.jdbc.Driver"/>
@@ -38,7 +38,7 @@
         <environment id="master">
             <transactionManager type="JDBC"/>
             <dataSource type="POOLED">
-                <property name="driver" value="com.mysql.jdbc.Driver"/>
+                <property name="driver" value="com.mysql.cj.jdbc.Driver"/>
                 <property name="url" value="jdbc:mysql://10.23.151.148:3306/DeliveryTakingSystem"/>
                 <property name="username" value="root"/>
                 <property name="password" value="qaz123"/>

src/main/resources/static/Index.html

@@ -193,7 +193,7 @@
     </ul>
 
 
-    <!-- 订单详情页， 包含了所有用户待接单， 供人选择 -->
+    <!-- 订单详情页， 包含了所有用户未接单， 供人选择 -->
     <div id="all-order" class="row">
 <!--        <div class="col-sm-4 col-md-3">-->
 <!--            <div class="thumbnail">-->

src/main/resources/static/Order.html

@@ -33,12 +33,87 @@
     </style>
 
     <script>
-        function myClick(n){
-           location.href = "OrderInfo.html";
+        // function myClick(n){
+        //    location.href = "OrderInfo.html";
+        // }
+        // function btnClick(){
+        //     alert("btn");
+        //     return false;
+        // }
+
+        $(function () {
+            // 发一个请求给后端, 让后端看看有没有session
+            $.ajax({
+                url:"/user/check",
+                success: function (data) {
+                    if(data["flag"] < 0){
+                        // 还没登录
+                        $("#register").show();
+                        $("#login").show();
+                    }else{
+                        // 已经登录了
+                        $("#logout").show();
+                    }
+                },
+                error: function () {
+                    console.log("error");
+                }
+            });
+
+            // 点了注销会发生什么
+            $("#logout").click(function () {
+                $("#logout").hide();
+                $("#register").show();
+                $("#login").show();
+                $.ajax({
+                    url:"/user/logout",
+                    success: function (data) {
+                        console.log("log out success")
+                    },
+                    error: function () {
+                        console.log("error");
+                    }
+                });
+            });
+        })
+
+        // 点击按钮 取消，
+        function cancel(node){
+            $.ajax({
+                url:"/order/cancel",
+                data:{
+                    orderId: $(node).parent().attr("orderId")
+                },
+                type:"GET",
+                success:function () {
+                    // 把该订单隐藏
+                    $(node).parent().parent().hide();
+                },
+                error: function () {
+                    alert("取消订单失败，请联系开发者wyz解决问题");
+                }
+            })
         }
-        function btnClick(){
-            alert("btn");
-            return false;
+
+
+        // 点击按钮 确认完成
+        function confirm(node){
+            $.ajax({
+                url:"/order/confirmCompleted",
+                data:{
+                    orderId: $(node).parent().attr("orderId")
+                },
+                type:"GET",
+                success:function () {
+                    // 把 俩按钮 隐藏
+                    $(node).prev().hide();
+                    $(node).hide();
+                    $(node).parent().prev().text("已完成");
+                },
+                error: function () {
+                    alert("确认完成失败，请联系开发者wyz解决问题");
+                }
+            })
         }
 
     </script>
@@ -89,19 +164,26 @@
 
 
                     // 【操作】
-                    var delete_op = document.createElement("button");
-                    delete_op.setAttribute("class","btn btn-danger");
-                    delete_op.innerText = "删除订单";
-                    var commit_op = document.createElement("button");
-                    commit_op.setAttribute("class","btn btn-success");
-                    commit_op.innerText = "提交订单";
-
                     var ops = document.createElement("div");
                     ops.setAttribute("class","col-sm-2 line-center");
-                    ops.append(delete_op);
-                    ops.append(commit_op);
-                    node.append(ops)
+                    ops.setAttribute("orderId",order.id);
+                    if(order.status=="未接单"){
+                        var op1 = document.createElement("button");
+                        op1.setAttribute("class","btn btn-danger");
+                        op1.setAttribute("onclick","cancel(this);");
+                        op1.innerText = "取消订单";
+
+                        ops.append(op1);
+                    }else if(order.status=="已接单" || order.status=="已送达"){
+                        var op2 = document.createElement("button");
+                        op2.setAttribute("class","btn btn-success");
+                        op2.setAttribute("onclick","confirm(this);");
+                        op2.innerText = "确认完成";
+
+                        ops.append(op2);
+                    }
 
+                    node.append(ops)
 
                     $("div.list-group").append(node);
                 }
@@ -112,39 +194,10 @@
             }
         });
 
-        // 发一个请求给后端, 让后端看看有没有session
-        $.ajax({
-            url:"/user/check",
-            success: function (data) {
-                if(data["flag"] < 0){
-                    // 还没登录
-                    $("#register").show();
-                    $("#login").show();
-                }else{
-                    // 已经登录了
-                    $("#logout").show();
-                }
-            },
-            error: function () {
-                console.log("error");
-            }
-        });
 
-        // 点了注销会发生什么
-        $("#logout").click(function () {
-            $("#logout").hide();
-            $("#register").show();
-            $("#login").show();
-            $.ajax({
-                url:"/user/logout",
-                success: function (data) {
-                    console.log("log out success")
-                },
-                error: function () {
-                    console.log("error");
-                }
-            });
-        });
+
+        // 点击操作按钮，进行操作
+
 
     })
 </script>

src/main/resources/static/OrderInfo.html

@@ -82,7 +82,7 @@
                 $("td#sender").text(data.sender);
                 $("td#phone").text(data.phone);
                 $("td#comment").text(data.comment);
-                $("td#price").text(data.price);
+                $("span#price").text(data.price+" 元");
             },
             error: function () {
                 alert("获取订单详情失败，请联系开发者wyz解决问题");
@@ -99,7 +99,7 @@
                 },
                 type: "GET",
                 success: function () {
-                    location.assign("/Index.html");
+                    location.assign("/PickedOrder.html");
                 },
                 errot:function () {
                     alert("接单失败，请联系开发者wyz解决问题");
@@ -256,7 +256,7 @@
                     <th></th>
                     <th></th>
 <!--                    <th>商品总数：</th><td>12</td>-->
-                    <th>订单总价：</th><td><span id="price" class="text-danger">123.0元</span></label></td>
+                    <th>订单总价：</th><td><span id="price" class="text-danger">...</span></label></td>
                 </tr>
             </table>
         </div>

src/main/resources/static/PickedOrder.html

@@ -33,14 +33,92 @@
     </style>
 
     <script>
-        function myClick(n){
-            location.href = "OrderInfo.html";
+        // function myClick(n){
+        //     location.href = "OrderInfo.html";
+        // }
+        // function btnClick(){
+        //     alert("btn");
+        //     return false;
+        // }
+
+        $(function(){
+            // 发一个请求给后端, 让后端看看有没有session
+            $.ajax({
+                url:"/user/check",
+                success: function (data) {
+                    if(data["flag"] < 0){
+                        // 还没登录
+                        $("#register").show();
+                        $("#login").show();
+                    }else{
+                        // 已经登录了
+                        $("#logout").show();
+                    }
+                },
+                error: function () {
+                    console.log("error");
+                }
+            });
+
+            // 点了注销会发生什么
+            $("#logout").click(function () {
+                $("#logout").hide();
+                $("#register").show();
+                $("#login").show();
+                $.ajax({
+                    url:"/user/logout",
+                    success: function (data) {
+                        console.log("log out success")
+                    },
+                    error: function () {
+                        console.log("error");
+                    }
+                });
+            });
+        });
+
+
+        // 点击按钮 取消接单，
+        function cancel(node){
+            $.ajax({
+                url:"/order/cancelPicked",
+                data:{
+                    orderId: $(node).parent().attr("orderId")
+                },
+                type:"GET",
+                success:function () {
+                    // 把该订单隐藏
+                    $(node).parent().parent().hide();
+                },
+                error: function () {
+                    alert("取消接单失败，请联系开发者wyz解决问题");
+                }
+            })
         }
-        function btnClick(){
-            alert("btn");
-            return false;
+
+
+        // 点击按钮 确认送达
+        function confirm(node){
+            $.ajax({
+                url:"/order/confirmPicked",
+                data:{
+                    orderId: $(node).parent().attr("orderId")
+                },
+                type:"GET",
+                success:function () {
+                    // 把 俩按钮 隐藏
+                    $(node).prev().hide();
+                    $(node).hide();
+                    // 还要把 订单 的状态改了
+                    $(node).parent().prev().text("已送达");
+                },
+                error: function () {
+                    alert("确认送达失败，请联系开发者wyz解决问题");
+                }
+            })
         }
 
+
     </script>
 </head>
 <body>
@@ -51,7 +129,7 @@
         // 发一个请求获取全部订单
         // 后面可以改成每次拿10个
         $.ajax({
-            url:"/order/own",
+            url:"/order/picked",
             success: function (data) {
                 for (var order of data){
                     var node = document.createElement("div");
@@ -75,11 +153,11 @@
                     price.innerText = order.price;
                     node.append(price)
 
-                    // 接单人
-                    var receiver = document.createElement("div");
-                    receiver.setAttribute("class","col-sm-2 line-center");
-                    receiver.innerText = order.receiver;
-                    node.append(receiver)
+                    // 发单人
+                    var sender = document.createElement("div");
+                    sender.setAttribute("class","col-sm-2 line-center");
+                    sender.innerText = order.sender;
+                    node.append(sender)
 
                     // 订单状态
                     var status = document.createElement("div");
@@ -89,63 +167,35 @@
 
 
                     // 【操作】
-                    var delete_op = document.createElement("button");
-                    delete_op.setAttribute("class","btn btn-danger");
-                    delete_op.innerText = "删除订单";
-                    var commit_op = document.createElement("button");
-                    commit_op.setAttribute("class","btn btn-success");
-                    commit_op.innerText = "提交订单";
-
                     var ops = document.createElement("div");
                     ops.setAttribute("class","col-sm-2 line-center");
-                    ops.append(delete_op);
-                    ops.append(commit_op);
+                    ops.setAttribute("orderId",order.id);
+                    if(order.status=="已接单"){
+                        var op1 = document.createElement("button");
+                        op1.setAttribute("class","btn btn-danger");
+                        //op1.setAttribute("id","cancel") //这么多id都是”cancel“，这样是不行的
+                        op1.setAttribute("onclick","cancel(this);");
+                        op1.innerText = "取消接单";
+
+                        var op2 = document.createElement("button");
+                        op2.setAttribute("class","btn btn-success");
+                        // op2.setAttribute("id","confirm")
+                        op2.setAttribute("onclick","confirm(this);");
+                        op2.innerText = "确认送达";
+
+                        ops.append(op1);
+                        ops.append(op2);
+                    }
                     node.append(ops)
 
-
                     $("div.list-group").append(node);
                 }
 
             },
             error: function () {
-                // alert("获取用户订单失败，请联系开发者wyz解决问题");
-            }
-        });
-
-        // 发一个请求给后端, 让后端看看有没有session
-        $.ajax({
-            url:"/user/check",
-            success: function (data) {
-                if(data["flag"] < 0){
-                    // 还没登录
-                    $("#register").show();
-                    $("#login").show();
-                }else{
-                    // 已经登录了
-                    $("#logout").show();
-                }
-            },
-            error: function () {
-                console.log("error");
+                alert("获取接单失败，请联系开发者wyz解决问题");
             }
         });
-
-        // 点了注销会发生什么
-        $("#logout").click(function () {
-            $("#logout").hide();
-            $("#register").show();
-            $("#login").show();
-            $.ajax({
-                url:"/user/logout",
-                success: function (data) {
-                    console.log("log out success")
-                },
-                error: function () {
-                    console.log("error");
-                }
-            });
-        });
-
     })
 </script>
 

src/main/resources/static/UserInfo.html

@@ -85,6 +85,7 @@
                 }else{
                     // 已经登录了
                     $("#logout").show();
+                    $("#username").text(data.username);
                 }
             },
             error: function () {
@@ -145,6 +146,7 @@
     <div class="row thumbnail center col-sm-12">
         <div class="col-sm-12">
             <h1 class="text-center" style="margin-bottom: 30px">个人中心</h1>
+            <p  class="text-center" style="margin-bottom: 30px"><b id="username">...</b></p>
         </div>
 
         <ul class="nav nav-tabs nav-justified" id="myTabs">

table.sql

@@ -32,7 +32,7 @@ insert into `user` values(5,"betaberry","100299","110");
 insert into `order` values(1,"订单1","2020/12/10","中北校区，河西食堂后面", 5, 1, 10, "已接单","加油！奥力给","2020/12/10 10:30:30");
 insert into `order` values(2,"订单2","2020/12/11","中北校区，河西食堂后面", 5, 6, 60, "已接单","加油！奥力给","2020/12/10 10:30:30");
 insert into `order` values(3,"订单3","2020/12/12","中北校区，河西食堂后面", 5, 8, 80, "已接单","加油！奥力给","2020/12/10 10:30:30");
-insert into `order` values(4,"订单4","2020/12/13","中北校区，河西食堂后面", 5, null, 10, "待接单","加油！奥力给","2020/12/10 10:30:30");
-insert into `order` values(5,"订单5","2020/12/14","中北校区，河西食堂后面", 5, null, 60, "待接单","加油！奥力给","2020/12/10 10:30:30");
-insert into `order` values(6,"订单6","2020/12/15","中北校区，河西食堂后面", 5, null, 60, "待接单","加油！奥力给","2020/12/10 10:30:30");
+insert into `order` values(4,"订单4","2020/12/13","中北校区，河西食堂后面", 5, null, 10, "未接单","加油！奥力给","2020/12/10 10:30:30");
+insert into `order` values(5,"订单5","2020/12/14","中北校区，河西食堂后面", 5, null, 60, "未接单","加油！奥力给","2020/12/10 10:30:30");
+insert into `order` values(6,"订单6","2020/12/15","中北校区，河西食堂后面", 5, null, 60, "未接单","加油！奥力给","2020/12/10 10:30:30");