diff --git a/src/main/java/com/inks/hb/logInfo/service/LogInfoServiceImpl.java b/src/main/java/com/inks/hb/logInfo/service/LogInfoServiceImpl.java
index d779158..be7fb87 100644
--- a/src/main/java/com/inks/hb/logInfo/service/LogInfoServiceImpl.java
+++ b/src/main/java/com/inks/hb/logInfo/service/LogInfoServiceImpl.java
@@ -92,3 +92,97 @@ public class LogInfoServiceImpl implements LogInfoService {
         return 1;
     }
 }
+//package com.inks.hb.logInfo.service;
+//
+//import com.inks.hb.logInfo.dao.LogInfoDao;
+//import com.inks.hb.logInfo.pojo.LogInfo;
+//
+//import java.sql.SQLException;
+//import java.util.ArrayList;
+//
+//public class LogInfoServiceImpl implements LogInfoService {
+//
+//    //实例化LogInfoDao
+//    private LogInfoDao dao = new LogInfoDao();
+//
+//    /**
+//     * 这里接收包装好的对象
+//     *
+//     * @param logInfo 日志
+//     * @return 状态码 0失败 1成功
+//     */
+//    @Override
+//    public int insertLogInfo(LogInfo logInfo) {
+//        int check = 0;
+//
+//        try {
+//            //调用dao的insertData方法插入数据
+//            dao.insertData(logInfo);
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//            return 0;
+//        }
+//        return 1;
+//    }
+//
+//    /**
+//     * 删除
+//     *
+//     * @param logId 主键
+//     * @return 状态码 1成功 0失败
+//     */
+//    @Override
+//    public int deleteLogInfo(int logId) {
+//
+//        //创建LogInfo对象
+//        LogInfo logInfo = new LogInfo();
+//        logInfo.setLogId(logId);
+//
+//        try {
+//            //调用dao的deleteData方法删除数据
+//            dao.deleteData(logInfo);
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//            return 0;
+//        }
+//        return 1;
+//    }
+//
+//    @Override
+//    public ArrayList query(int page, int limit) {
+//        int start = (page * limit) - limit + 1; //每一页的起始位置
+//
+//        if (start < 1)  //小于1的话会触发一个错误
+//            start = 1;  //但是理论上page和limit是由table表格生成的参数
+//
+//        try {
+//            return dao.query(start, limit);
+//        } catch (SQLException e) {
+//            System.out.println(e.getErrorCode() + e.getMessage());
+//            return null;
+//        }
+//    }
+//
+//    @Override
+//    public int queryLogInfoNum() {
+//        try {
+//            return dao.queryDataNum();
+//        } catch (SQLException e) {
+//            System.out.println(e.getErrorCode() + e.getMessage());
+//            return -1;
+//        }
+//    }
+//
+//    @Override
+//    public int deleteByName(int loginId) {
+//        try {
+//            ArrayList<LogInfo> list = dao.queryName(loginId);
+//            for (LogInfo logInfo : list)
+//                dao.deleteData(logInfo);
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//            return -1;
+//        }
+//        return 1;
+//    }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/inks/hb/orderinfo/controller/InsertAndUpdateServlet.java b/src/main/java/com/inks/hb/orderinfo/controller/InsertAndUpdateServlet.java
index 2a3acfb..d625f7e 100644
--- a/src/main/java/com/inks/hb/orderinfo/controller/InsertAndUpdateServlet.java
+++ b/src/main/java/com/inks/hb/orderinfo/controller/InsertAndUpdateServlet.java
@@ -71,3 +71,76 @@ public class InsertAndUpdateServlet extends HttpServlet {
         out.print(gson.toJson(code));
     }
 }
+//package com.inks.hb.orderinfo.controller;
+//
+//import com.google.gson.Gson;
+//import com.inks.hb.login.pojo.Login;
+//import com.inks.hb.orderinfo.pojo.OrderInfo;
+//import com.inks.hb.orderinfo.service.OrderInfoService;
+//import com.inks.hb.orderinfo.service.OrderInfoServiceImpl;
+//import com.inks.hb.roomtype.pojo.RoomType;
+//
+//import javax.servlet.annotation.WebServlet;
+//import javax.servlet.http.HttpServlet;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
+//import java.io.PrintWriter;
+//
+//@WebServlet(name = "InsertAndUpdateServlet", value = "/InsertAndUpdateServlet")
+//public class InsertAndUpdateServlet extends HttpServlet {
+//    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        this.doGet(request, response);
+//    }
+//
+//    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//
+//        request.setCharacterEncoding("utf-8");
+//        response.setContentType("text/html;charset=utf-8");
+//        PrintWriter out = response.getWriter();
+//
+//        OrderInfoService service = new OrderInfoServiceImpl();
+//
+//        String orderId = request.getParameter("orderId");  //1
+//        String orderName = request.getParameter("orderName");  //2
+//        String orderPhone = request.getParameter("orderPhone"); //3
+//        String orderIDcard = request.getParameter("orderIDcard");  //4
+//        RoomType typeId = new RoomType(request.getParameter("typeId")); //5
+//        String arrireDate = request.getParameter("arrireDate"); //6
+//        String leaveDate = request.getParameter("leaveDate"); //7
+//        String orderState = request.getParameter("orderState"); //8
+//        String checkNum = request.getParameter("checkNum"); //9
+//        String roomId = ""; //10
+//        String price = request.getParameter("price"); //11
+//        String checkPrice = request.getParameter("checkPrice"); //12
+//        String discountReason = request.getParameter("discountReason"); //14
+//        String addBed = request.getParameter("addBed"); //15
+//        String addBedPrice = request.getParameter("addBedPrice"); //16
+//        String orderMoney = request.getParameter("orderMoney"); //17
+//        String remark = request.getParameter("remark"); //18
+//        Login operatorId = new Login(request.getParameter("operatorId")); //19
+//        int make = Integer.parseInt(request.getParameter("make")); // 20 标志啊
+//
+//        int discount;
+//
+//        try {
+//            discount = Integer.parseInt(request.getParameter("discount")); //13
+//        } catch (NumberFormatException e) {
+//            discount = 0;
+//        }
+//
+//        OrderInfo orderInfo = new OrderInfo(orderId, orderName, orderPhone, orderIDcard, typeId, arrireDate, leaveDate, orderState, checkNum, roomId, price, checkPrice, discount, discountReason, addBed, addBedPrice, orderMoney, remark, operatorId);
+//
+//        int code = -1;
+//
+//        if (make == 1) {
+//            code = service.insertOrderInfo(orderInfo);
+//        } else if (make == 2) {
+//            code = service.updateOrderInfo(orderInfo);
+//        }
+//
+//
+//        Gson gson = new Gson();
+//        out.print(gson.toJson(code));
+//    }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/inks/hb/orderinfo/controller/OrderInfoExcelServlet.java b/src/main/java/com/inks/hb/orderinfo/controller/OrderInfoExcelServlet.java
index 9efbc61..80275e3 100644
--- a/src/main/java/com/inks/hb/orderinfo/controller/OrderInfoExcelServlet.java
+++ b/src/main/java/com/inks/hb/orderinfo/controller/OrderInfoExcelServlet.java
@@ -63,3 +63,68 @@ public class OrderInfoExcelServlet extends HttpServlet {
         ee.exportExcel(headers, list, fileName, response);
     }
 }
+//package com.inks.hb.orderinfo.controller;
+//
+//import com.inks.hb.common.ExportExcel;
+//import com.inks.hb.orderinfo.pojo.OrderInfo;
+//import com.inks.hb.orderinfo.pojo.OrderToTable;
+//import com.inks.hb.orderinfo.service.OrderInfoService;
+//import com.inks.hb.orderinfo.service.OrderInfoServiceImpl;
+//import com.inks.hb.roomtype.service.RoomTypeService;
+//import com.inks.hb.roomtype.service.RoomTypeServiceImpl;
+//
+//import javax.servlet.annotation.WebServlet;
+//import javax.servlet.http.HttpServlet;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.util.ArrayList;
+//
+//@WebServlet(name = "OrderInfoExcelServlet", value = "/OrderInfoExcelServlet")
+//public class OrderInfoExcelServlet extends HttpServlet {
+//    // 处理POST请求
+//    protected void doPost(HttpServletRequest request, HttpServletResponse response) {
+//        this.doGet(request, response);
+//    }
+//
+//    // 处理GET请求
+//    protected void doGet(HttpServletRequest request, HttpServletResponse response) {
+//
+//        // 创建OrderInfoService实例
+//        OrderInfoService service = new OrderInfoServiceImpl();
+//        // 创建RoomTypeService实例
+//        RoomTypeService roomTypeService = new RoomTypeServiceImpl();
+//
+//        // 查询所有订单信息
+//        ArrayList<OrderInfo> infoArrayList = service.query(1, service.queryOrderInfoNum());
+//
+//        // 创建一个ArrayList用于存储OrderToTable对象
+//        ArrayList<OrderToTable> list = new ArrayList<>();
+//
+//        // 创建OrderToTable对象
+//        OrderToTable toTable;
+//
+//        // 遍历订单信息列表
+//        for (OrderInfo orderInfo : infoArrayList) {
+//            // 将订单信息转换为OrderToTable对象
+//            toTable = new OrderToTable(orderInfo.getOrderId(), orderInfo.getOrderName(), orderInfo.getOrderPhone()
+//                    , orderInfo.getOrderIDcard(), orderInfo.getArrireDate(), orderInfo.getLeaveDate()
+//                    , roomTypeService.query(orderInfo.getTypeId().getTypeId()).getTypeName()
+//                    , orderInfo.getCheckNum(), orderInfo.getPrice(), orderInfo.getCheckPrice()
+//                    , orderInfo.getDiscount(), orderInfo.getDiscountReason(), orderInfo.getAddBed()
+//                    , orderInfo.getAddBedPrice(), orderInfo.getOrderMoney(), orderInfo.getOrderState()
+//                    , orderInfo.getRemark(), orderInfo.getOperatorId().getLoginName());
+//            // 将OrderToTable对象添加到列表中
+//            list.add(toTable);
+//        }
+//
+//        // 定义Excel表头
+//        String[] headers = {"预订单号", "预定人", "联系电话", "身份证", "抵店时间", "离店时间", "房间类型", "入住人数", "客房价格", "入住价格", "折扣", "折扣原因", "是否加床", "加床价格", "预收款", "单据状态", "备注", "操作员"};
+//        // 定义Excel文件名
+//        String fileName = "预订单信息";
+//
+//        // 创建ExportExcel实例
+//        ExportExcel<OrderToTable> ee = new ExportExcel<>();
+//        // 导出Excel文件
+//        ee.exportExcel(headers, list, fileName, response);
+//    }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/inks/hb/orderinfo/controller/OrderInfoServlet.java b/src/main/java/com/inks/hb/orderinfo/controller/OrderInfoServlet.java
index e49a9b5..40ccc19 100644
--- a/src/main/java/com/inks/hb/orderinfo/controller/OrderInfoServlet.java
+++ b/src/main/java/com/inks/hb/orderinfo/controller/OrderInfoServlet.java
@@ -83,3 +83,88 @@ public class OrderInfoServlet extends HttpServlet {
         out.print(gson.toJson(pojotoGson));
     }
 }
+//package com.inks.hb.orderinfo.controller;
+//
+//import com.google.gson.Gson;
+//import com.inks.hb.common.PojotoGson;
+//import com.inks.hb.orderinfo.pojo.OrderInfo;
+//import com.inks.hb.orderinfo.pojo.OrderToTable;
+//import com.inks.hb.orderinfo.service.OrderInfoService;
+//import com.inks.hb.orderinfo.service.OrderInfoServiceImpl;
+//import com.inks.hb.roomtype.service.RoomTypeService;
+//import com.inks.hb.roomtype.service.RoomTypeServiceImpl;
+//
+//import javax.servlet.annotation.WebServlet;
+//import javax.servlet.http.HttpServlet;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
+//import java.io.PrintWriter;
+//import java.util.ArrayList;
+//
+//@WebServlet(name = "OrderInfoServlet", value = "/OrderInfoServlet")
+//public class OrderInfoServlet extends HttpServlet {
+//    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        this.doGet(request, response);
+//    }
+//
+//    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//
+//        request.setCharacterEncoding("utf-8");
+//        response.setContentType("text/html;charset=utf-8");
+//        PrintWriter out = response.getWriter();
+//
+//        int page = Integer.parseInt(request.getParameter("page")); // 当前页码
+//        int limit = Integer.parseInt(request.getParameter("limit")); // 每页的数据量
+//        int make = Integer.parseInt(request.getParameter("make")); //状态标志
+//
+//        // 调用service
+//        OrderInfoService service = new OrderInfoServiceImpl();
+//        RoomTypeService roomTypeService = new RoomTypeServiceImpl();
+//
+//        // 默认输出信息
+//        String code = "0"; //状态码
+//        String msg = "数据查询正常"; //状态信息
+//        String count; //数据总数
+//        ArrayList<OrderInfo> list = new ArrayList<>(); //数据内容
+//        ArrayList<OrderToTable> toTablesList = new ArrayList<>(); //转成可使用
+//        OrderToTable toTable;
+//
+//        //单个全局属性
+//        String orderId; //预定单号
+//        String select; //查询值
+//
+//        //获取对应状态shuxing
+//        if (make == 1 || make == 2) { //1和2这部分完全是相同的
+//            select = request.getParameter("select");
+//            list = service.queryOrder(make, select);
+//            count = String.valueOf(list.size());
+//            msg = "结果如下";
+//        } else if (make == 4) {
+//            orderId = request.getParameter("orderId");
+//            if (service.deleteOrderInfo(orderId) == -1) {
+//                msg = "删除失败";
+//                code = "-1";
+//            }
+//            count = String.valueOf(service.queryOrderInfoNum());
+//        } else {
+//            list = service.query(page, limit);
+//            count = String.valueOf(service.queryOrderInfoNum());
+//        }
+//
+//        for (OrderInfo orderInfo : list) { //转换成前端界面可接收的类型 主要是转 房间类型 和操作员
+//            toTable = new OrderToTable(orderInfo.getOrderId(), orderInfo.getOrderName(), orderInfo.getOrderPhone()
+//                    , orderInfo.getOrderIDcard(), orderInfo.getArrireDate(), orderInfo.getLeaveDate()
+//                    , roomTypeService.query(orderInfo.getTypeId().getTypeId()).getTypeName()
+//                    , orderInfo.getCheckNum(), orderInfo.getPrice(), orderInfo.getCheckPrice()
+//                    , orderInfo.getDiscount(), orderInfo.getDiscountReason(), orderInfo.getAddBed()
+//                    , orderInfo.getAddBedPrice(), orderInfo.getOrderMoney(), orderInfo.getOrderState()
+//                    , orderInfo.getRemark(), orderInfo.getOperatorId().getLoginName());
+//            toTablesList.add(toTable);
+//        }
+//
+//        PojotoGson pojotoGson = new PojotoGson(code, msg, count, toTablesList);
+//        Gson gson = new Gson();
+//        out.print(gson.toJson(pojotoGson));
+//    }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/inks/hb/orderinfo/controller/QueryOrderInfoServlet.java b/src/main/java/com/inks/hb/orderinfo/controller/QueryOrderInfoServlet.java
index 7791db3..acd72d6 100644
--- a/src/main/java/com/inks/hb/orderinfo/controller/QueryOrderInfoServlet.java
+++ b/src/main/java/com/inks/hb/orderinfo/controller/QueryOrderInfoServlet.java
@@ -46,3 +46,51 @@ public class QueryOrderInfoServlet extends HttpServlet {
         out.print(gson.toJson(toTable));
     }
 }
+//package com.inks.hb.orderinfo.controller;
+//
+//import com.google.gson.Gson;
+//import com.inks.hb.orderinfo.pojo.OrderInfo;
+//import com.inks.hb.orderinfo.pojo.OrderToTable;
+//import com.inks.hb.orderinfo.service.OrderInfoServiceImpl;
+//import com.inks.hb.roomtype.service.RoomTypeServiceImpl;
+//
+//import javax.servlet.annotation.WebServlet;
+//import javax.servlet.http.HttpServlet;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
+//import java.io.PrintWriter;
+//
+//@WebServlet(name = "QueryOrderInfoServlet", value = "/QueryOrderInfoServlet")
+//public class QueryOrderInfoServlet extends HttpServlet {
+//    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        this.doGet(request, response);
+//    }
+//
+//    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//
+//        // 设置请求和响应的编码格式
+//        request.setCharacterEncoding("utf-8");
+//        response.setContentType("text/html;charset=utf-8");
+//        PrintWriter out = response.getWriter();
+//
+//        // 获取值
+//        String orderId = request.getParameter("orderId");
+//
+//        // 根据订单id查询订单信息
+//        OrderInfo orderInfo = new OrderInfoServiceImpl().query(orderId);
+//
+//        // 将订单信息转换为表格形式
+//        OrderToTable toTable = new OrderToTable(orderInfo.getOrderId(), orderInfo.getOrderName(), orderInfo.getOrderPhone()
+//                , orderInfo.getOrderIDcard(), orderInfo.getArrireDate(), orderInfo.getLeaveDate()
+//                , new RoomTypeServiceImpl().query(orderInfo.getTypeId().getTypeId()).getTypeId()
+//                , orderInfo.getCheckNum(), orderInfo.getPrice(), orderInfo.getCheckPrice()
+//                , orderInfo.getDiscount(), orderInfo.getDiscountReason(), orderInfo.getAddBed()
+//                , orderInfo.getAddBedPrice(), orderInfo.getOrderMoney(), orderInfo.getOrderState()
+//                , orderInfo.getRemark(), orderInfo.getOperatorId().getLoginName());
+//
+//        // 将表格形式转换为json格式
+//        Gson gson = new Gson();
+//        out.print(gson.toJson(toTable));
+//    }
+//}
\ No newline at end of file