修改订单展示，订单导出接口

src/main/java/com/template/api/HouseOrderAPI.java

@@ -62,7 +62,7 @@ public interface HouseOrderAPI {
 
     @GetMapping("/queryExport")
     @ApiOperation(value = "订单管理-订单导出", notes = "订单管理-订单导出", httpMethod = "GET")
-    void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime);
+    void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack);
 
     @GetMapping("/reportStatistics")
     @ApiOperation(value = "统计报表", notes = "统计报表", httpMethod = "GET")

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -868,17 +868,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 users1.setIdCardInformation(idCardInformation);
 //                users1.setUserMenuId("1");
                 boolean save = usersService.save(users1);
-//                houseOrder.setLiveUsersId(users1.getId() + "");
+                houseOrder.setLiveUsersId(users1.getId() + "");
             } else {
 //                users.setCardNumber(cardNumber);
                 users.setFingerprint(fingerprint);
                 users.setIdCard(idCard);
                 users.setIdCardInformation(idCardInformation);
                 usersService.updateById(users);
-//                houseOrder.setLiveUsersId(users.getId() + "");
+                houseOrder.setLiveUsersId(users.getId() + "");
             }
-            houseOrder.setLiveUsersId(users.getId() + "");
-            houseOrder.setLiveUsersId(houseOrder.getReserveUserId());
+
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             Date liveDate = Date.from(LocalDateTime.parse(liveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
             Date leaveDate = Date.from(LocalDateTime.parse(leaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());

src/main/java/com/template/controller/HouseOrderController.java

@@ -296,9 +296,9 @@ public class HouseOrderController implements HouseOrderAPI {
 //        预定人电话号码
         houseOrder.setReservePhone(establishOrderDto.getReservePhone());
 //        预定入住时间
-        houseOrder.setReserveLiveTime(establishOrderDto.getReserveLiveTime());
+        houseOrder.setReserveLiveTime(reserveLiveTime);
 //        预定离开时间
-        houseOrder.setReserveLeaveTime(establishOrderDto.getReserveLeaveTime());
+        houseOrder.setReserveLeaveTime(reserveLeaveTime);
 //        超时时间
         String timeOut = now.plusMinutes(15).format(dateTimeFormatter1);
         houseOrder.setTimeOut(timeOut);
@@ -592,7 +592,7 @@ public class HouseOrderController implements HouseOrderAPI {
             size = 10;
         }
 
-        PageUtils<HouseOrderPageListVo> pageList = houseOrderService.pageList(page, size, keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime);
+        PageUtils<HouseOrderPageListVo> pageList = houseOrderService.pageList(page, size, keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack);
         List<HouseOrderPageListVo> list = pageList.getList();
         for (int i = 0; i < list.size(); i++) {
             HouseOrderPageListVo houseOrderPageListVo = list.get(i);
@@ -1417,7 +1417,7 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime) {
+    public void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack) {
 //        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
 //        if (ObjectUtils.isEmpty(permissionSetting)) {
 //            return CommonResult.fail("非法进入");
@@ -1428,64 +1428,61 @@ public class HouseOrderController implements HouseOrderAPI {
 //            return CommonResult.fail("此账号暂无该权限");
 //        }
 
-        List<QueryExportVo> vos = houseOrderService.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime);
+        List<QueryExportVo> vos = houseOrderService.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack);
 
         //        导出
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("订单表");
         Row headerRow = sheet.createRow(0);
-        headerRow.createCell(0).setCellValue("订单号");
-        headerRow.createCell(1).setCellValue("入住时间");
-        headerRow.createCell(2).setCellValue("离店时间");
-        headerRow.createCell(3).setCellValue("用户人名称");
-        headerRow.createCell(4).setCellValue("入住人名称");
-        headerRow.createCell(5).setCellValue("手机号码");
-        headerRow.createCell(6).setCellValue("房型");
-        headerRow.createCell(7).setCellValue("房间号");
-        headerRow.createCell(8).setCellValue("订单金额");
-        headerRow.createCell(9).setCellValue("支付方式");
-        headerRow.createCell(10).setCellValue("订单渠道");
-        headerRow.createCell(11).setCellValue("订单状态");
-        headerRow.createCell(12).setCellValue("支付时间");
-        headerRow.createCell(13).setCellValue("退款时间");
-        headerRow.createCell(14).setCellValue("取消时间");
+        headerRow.createCell(0).setCellValue("房间号");
+        headerRow.createCell(1).setCellValue("房类");
+        headerRow.createCell(2).setCellValue("房型名称");
+        headerRow.createCell(3).setCellValue("钥匙类型");
+        headerRow.createCell(4).setCellValue("是否归还");
+        headerRow.createCell(5).setCellValue("预定人");
+        headerRow.createCell(6).setCellValue("手机号码");
+        headerRow.createCell(7).setCellValue("入住人");
+        headerRow.createCell(8).setCellValue("身份证");
+        headerRow.createCell(9).setCellValue("订单号");
+        headerRow.createCell(10).setCellValue("入住时间");
+        headerRow.createCell(11).setCellValue("离店时间");
+        headerRow.createCell(12).setCellValue("订单金额(元)");
+        headerRow.createCell(13).setCellValue("订单状态");
+        headerRow.createCell(14).setCellValue("备注");
+        headerRow.createCell(15).setCellValue("支付类型");
+        headerRow.createCell(16).setCellValue("来源渠道");
+        headerRow.createCell(17).setCellValue("支付时间");
+        headerRow.createCell(18).setCellValue("退款时间");
+        headerRow.createCell(19).setCellValue("取消时间");
 
         if (ObjectUtils.isNotEmpty(vos) && vos.size() > 0) {
             for (int i = 0; i < vos.size(); i++) {
                 QueryExportVo vo = vos.get(i);
                 Row dataRow1 = sheet.createRow(i + 1);
-                dataRow1.createCell(0).setCellValue(vo.getOrderNumber());
-                dataRow1.createCell(1).setCellValue(vo.getLiveTime());
-                dataRow1.createCell(2).setCellValue(vo.getLeaveTime());
-                dataRow1.createCell(3).setCellValue(vo.getReserveName());
-                dataRow1.createCell(4).setCellValue(vo.getLiveName());
-                dataRow1.createCell(5).setCellValue(vo.getPhone());
-                dataRow1.createCell(6).setCellValue(vo.getHouseName());
-                dataRow1.createCell(7).setCellValue(vo.getHouseNumber());
+                dataRow1.createCell(0).setCellValue(vo.getHouseNumber());
+                Integer roomType = vo.getRoomType();
+                String houseSta="全日房";
+                if (2==roomType) {
+                    houseSta="钟点房";
+                }
+                dataRow1.createCell(1).setCellValue(houseSta);
+                dataRow1.createCell(2).setCellValue(vo.getHouseName());
+                dataRow1.createCell(3).setCellValue(vo.getLockStatus());
+                dataRow1.createCell(4).setCellValue(vo.getGiveBack());
+                dataRow1.createCell(5).setCellValue(vo.getReserveName());
+                dataRow1.createCell(6).setCellValue(vo.getPhone());
+                dataRow1.createCell(7).setCellValue(vo.getLiveName());
+                dataRow1.createCell(8).setCellValue(vo.getIdCard());
+                dataRow1.createCell(9).setCellValue(vo.getOrderNumber());
+                dataRow1.createCell(10).setCellValue(vo.getLiveTime());
+                dataRow1.createCell(11).setCellValue(vo.getLeaveTime());
                 BigDecimal orderPrice = vo.getOrderPrice();
                 String price = "";
                 if (ObjectUtils.isNotEmpty(orderPrice)) {
                     price = orderPrice.toString();
                 }
-                dataRow1.createCell(8).setCellValue(price);
-                //                pay_type 支付方式（微信支付，现金）
-                String payType = vo.getPayType();
-                String payName = "";
-                if ("1".equals(payType)) {
-                    payName = "微信支付";
-                } else if ("2".equals(payType)) {
-                    payName = "现金";
-                }
-                dataRow1.createCell(9).setCellValue(payName);
-                //                order_channel 订单渠道（1：线上，2：线下）
-                String orderChannelType = vo.getOrderChannelType();
-                String orderChannelName = "";
-                if ("1".equals(orderChannelType)) {
-                    orderChannelName = "线上";
-                } else if ("2".equals(orderChannelType)) {
-                    orderChannelName = "线下";
-                }
-                dataRow1.createCell(10).setCellValue(orderChannelName);
+                dataRow1.createCell(12).setCellValue(price);
+
                 //                订单 订单状态 1.待支付，2.已支付，3.待入住，4.已入住，5.待结账，6.退款中，7.已退款，8.已退房，9.已取消，超时
                 String orderStart = vo.getOrderStart();
                 String orderName = "";
@@ -1508,10 +1505,31 @@ public class HouseOrderController implements HouseOrderAPI {
                 } else if ("9".equals(orderStart)) {
                     orderName = "已取消";
                 }
-                dataRow1.createCell(11).setCellValue(orderName);
-                dataRow1.createCell(12).setCellValue(vo.getPayTime());
-                dataRow1.createCell(13).setCellValue(vo.getRefundTime());
-                dataRow1.createCell(14).setCellValue(vo.getCancelTime());
+                dataRow1.createCell(13).setCellValue(orderName);
+                dataRow1.createCell(14).setCellValue(vo.getRemark());
+
+                //                pay_type 支付方式（微信支付，现金）
+                String payType = vo.getPayType();
+                String payName = "";
+                if ("1".equals(payType)) {
+                    payName = "微信支付";
+                } else if ("2".equals(payType)) {
+                    payName = "现金";
+                }
+                dataRow1.createCell(15).setCellValue(payName);
+                //                order_channel 订单渠道（1：线上，2：线下）
+                String orderChannelType = vo.getOrderChannelType();
+                String orderChannelName = "";
+                if ("1".equals(orderChannelType)) {
+                    orderChannelName = "线上";
+                } else if ("2".equals(orderChannelType)) {
+                    orderChannelName = "线下";
+                }
+                dataRow1.createCell(16).setCellValue(orderChannelName);
+
+                dataRow1.createCell(17).setCellValue(vo.getPayTime());
+                dataRow1.createCell(18).setCellValue(vo.getRefundTime());
+                dataRow1.createCell(19).setCellValue(vo.getCancelTime());
             }
         }
         // 将工作簿写入文件

src/main/java/com/template/model/pojo/HouseOrder.java

@@ -127,6 +127,9 @@ public class HouseOrder implements Serializable {
     @ApiModelProperty(value = "超时时间")
     private String timeOut;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private String createTime;

src/main/java/com/template/model/vo/HouseOrderPageListVo.java

@@ -15,13 +15,20 @@ public class HouseOrderPageListVo {
     private String liveTime;
 //  离店时间
     private String leaveTime;
-//  用户名称
+////    预入住时间
+//    private String reserveLiveTime;
+////    预离店时间
+//    private String reserveLeaveTime;
+
+//  预定人名称
     private String reserveName;
-//    入住名称
+//  预定人手机号
+    private String phone;
+//    入住人名称
     private String liveName;
+//   入住人身份证
+    private String idCard;
 
-//  手机号
-    private String phone;
 
     //    房型名称
     private String houseName;
@@ -54,7 +61,7 @@ public class HouseOrderPageListVo {
     private Integer roomType;
 
     @ApiModelProperty(value = "钥匙类型开锁的方式（1.密码，2.卡片，3.指纹，4.身份证，5.钥匙）")
-    private Integer keyType;
+    private Integer lockStatus;
 
     @ApiModelProperty(value = "开锁密码")
     private String keyPassWord;
@@ -62,5 +69,7 @@ public class HouseOrderPageListVo {
     @ApiModelProperty(value = "是否归还 1:已归还，2：未归还")
     private Integer giveBack;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
 }

src/main/java/com/template/model/vo/HouseStateVo.java

@@ -40,4 +40,6 @@ public class HouseStateVo {
 
     private String building;
     private String element;
+    private Integer lockStatus;
+    private String passWord;
 }

src/main/java/com/template/model/vo/QueryExportVo.java

@@ -1,5 +1,6 @@
 package com.template.model.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -7,30 +8,53 @@ import java.util.Date;
 
 @Data
 public class QueryExportVo {
+    //    房间号
+    private String houseNumber;
+ //    房间类型（1:全日房，2：钟点房）
+    private Integer roomType;
+    //    房型
+    private String houseName;
+
+    @ApiModelProperty(value = "钥匙类型开锁的方式（1.密码，2.卡片，3.指纹，4.身份证，5.钥匙）")
+    private Integer lockStatus;
+
+    @ApiModelProperty(value = "是否归还 1:已归还，2：未归还")
+    private Integer giveBack;
+
+    //  预定人名称
+    private String reserveName;
+    //  预定人手机号
+    private String phone;
+    //    入住人名称
+    private String liveName;
+    //   入住人身份证
+    private String idCard;
+
     //    订单号
     private String orderNumber;
+
     //  入住时间
     private String liveTime;
+
     //  离店时间
     private String leaveTime;
-    //  用户名称
-    private String reserveName;
-    //    入住名称
-    private String liveName;
-    //  手机号
-    private String phone;
-    //    房型
-    private String houseName;
-    //    房间号
-    private String houseNumber;
+
     //  订单金额
     private BigDecimal orderPrice;
-    //    支付方式
-    private String payType;
+
+   //     订单状态
+   private String orderStart;
+
+//    备注
+    private String remark;
+
+   //    支付方式
+   private String payType;
+
     //    订单渠道
     private String orderChannelType;
-    //     订单状态
-    private String orderStart;
+
+
     //    支付时间
     private String payTime;
     //    退款时间

src/main/java/com/template/services/HouseOrderService.java

@@ -39,9 +39,9 @@ public interface HouseOrderService extends IService<HouseOrder> {
      */
     PriceVo reservePrice(String houseId, String cardNumber, String liveTime, String leaveTime);
 
-    PageUtils<HouseOrderPageListVo> pageList(int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime);
+    PageUtils<HouseOrderPageListVo> pageList(int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack);
 
-    List<QueryExportVo> queryExport(String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime);
+    List<QueryExportVo> queryExport(String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack);
 
 
     HouseOrderCheckInShowVo getOrderNumbre(String orderNumber);

src/main/java/com/template/services/impl/HouseOrderServiceImpl.java

@@ -323,15 +323,15 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
     }
 
     @Override
-    public PageUtils<HouseOrderPageListVo> pageList(int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime) {
+    public PageUtils<HouseOrderPageListVo> pageList(int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack) {
         Page<HouseOrderPageListVo> pageVo = new Page<>(page, size);
-        IPage<HouseOrderPageListVo> result = houseOrderMapper.pageList(pageVo, keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime);
+        IPage<HouseOrderPageListVo> result = houseOrderMapper.pageList(pageVo, keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack);
         return new PageUtils(result);
     }
 
     @Override
-    public List<QueryExportVo> queryExport(String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime) {
-        return houseOrderMapper.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime);
+    public List<QueryExportVo> queryExport(String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack) {
+        return houseOrderMapper.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack);
 
     }
 

src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -19,7 +19,9 @@
         ho.order_number as orderNumber,
         h.room_type as roomType,
         b.building,
-        b.element
+        b.element,
+        ho.key_type as lockStatus,
+        ho.key_pass_word as passWord
         FROM
         `house_number` hn
         LEFT JOIN house h ON h.id = hn.house_id

src/main/resources/mapper/template/HouseOrderMapper.xml

@@ -6,11 +6,14 @@
         SELECT
         ho.id,
         ho.order_number as orderNumber,
-        ho.reserve_live_time as liveTime,
-        ho.reserve_leave_time as leaveTime,
+--         ho.reserve_live_time as reserveLiveTime,
+--         ho.reserve_leave_time as reserveLeaveTime,
+        ho.live_time as liveTime,
+        ho.leave_time as LeaveTime,
         ho.reserve_name as reserveName,
-        ho.live_name as liveName,
         ho.reserve_phone as phone,
+        ho.live_name as liveName,
+        u.id_card as idCard,
         h.room_name as houseName,
         hn.room_number as houseNumber,
         ho.pay_price as orderPrice,
@@ -23,15 +26,19 @@
         ho.order_channel as orderChannel,
         h.id as houseId,
         hn.id as houseNumberId,
-        h.room_type as roomType
-
-
+        h.room_type as roomType,
+        ho.key_type as lockStatus,
+        ho.key_pass_word as keyPassWord,
+        ho.give_back as giveBack,
+        ho.remark
         FROM
         `house_order` ho
         LEFT JOIN house_number hn ON hn.id = ho.house_number_id
         AND hn.deleted = 0
         LEFT JOIN house h ON h.id = hn.house_id
         AND hn.deleted = 0
+        LEFT JOIN users u ON u.id = ho.live_users_id
+        AND u.deleted = 0
         <where>
             ho.deleted=0
             <if test="orderStatus != null and orderStatus != ''">
@@ -71,6 +78,18 @@
                 AND ho.leave_time >= #{leaveStartTime}
             </if>
 
+            <if test="houseId != null and houseId != ''">
+                AND ho.house_id = #{houseId}
+            </if>
+
+            <if test="keyType != null and keyType != ''">
+                AND ho.key_type = #{keyType}
+            </if>
+
+            <if test="giveBack != null and giveBack != ''">
+                AND ho.give_back = #{giveBack}
+            </if>
+
         </where>
         ORDER BY
         ho.create_time DESC
@@ -78,18 +97,23 @@
     </select>
     <select id="queryExport" resultType="com.template.model.vo.QueryExportVo">
         SELECT
+        hn.room_number as houseNumber,
+        h.room_type as roomType,
+        h.room_name as houseName,
+        ho.key_type as lockStatus,
+        ho.give_back as giveBack,
+        ho.reserve_name as reserveName,
+        ho.reserve_phone as phone,
+        ho.live_name as liveName,
+        u.id_card as idCard,
         ho.order_number as orderNumber,
         ho.live_time as liveTime,
         ho.leave_time as leaveTime,
-        ho.reserve_name as reserveName,
-        ho.live_name as liveName,
-        ho.reserve_phone as phone,
-        h.room_name as houseName,
-        hn.room_number as houseNumber,
         ho.pay_price as orderPrice,
-        ho.pay_type as payType,
-        ho.order_channel as payChannelType,
         ho.order_status as orderStart,
+        ho.remark,
+        ho.pay_type as payType,
+        ho.order_channel as orderChannelType,
         ho.pay_time as payTime,
         ho.refund_time as refundTime,
         ho.cancel_time as cancelTime
@@ -99,6 +123,8 @@
         AND hn.deleted = 0
         LEFT JOIN house h ON h.id = hn.house_id
         AND hn.deleted = 0
+        LEFT JOIN users u ON u.id = ho.live_users_id
+        AND u.deleted = 0
         <where>
             ho.deleted=0
             <if test="orderStatus != null and orderStatus != ''">
@@ -138,6 +164,18 @@
                 AND ho.leave_time >= #{leaveStartTime}
             </if>
 
+            <if test="houseId != null and houseId != ''">
+                AND ho.house_id = #{houseId}
+            </if>
+
+            <if test="keyType != null and keyType != ''">
+                AND ho.key_type = #{keyType}
+            </if>
+
+            <if test="giveBack != null and giveBack != ''">
+                AND ho.give_back = #{giveBack}
+            </if>
+
         </where>
         ORDER BY
         ho.create_time DESC