修改房态详情接口，添加是否归还接口

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

@@ -34,7 +34,7 @@ public interface HouseOrderAPI {
 
     @GetMapping("/pageList")
     @ApiOperation(value = "订单管理-订单页面展示", notes = "订单管理-订单页面展示", httpMethod = "GET")
-    CommonResult pageList(int adminId, 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);
+    CommonResult pageList(int adminId, 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);
 
     @PostMapping("/cancel")
     @ApiOperation(value = "订单管理-订单取消", notes = "订单管理-订单取消", httpMethod = "POST")
@@ -134,5 +134,11 @@ public interface HouseOrderAPI {
     @ApiOperation(value = "获取支付人openid", notes = "获取支付人openid", httpMethod = "POST")
     CommonResult getPayOpenId(@RequestParam String wxcode) throws Exception;
 
+
+    @GetMapping("/ifGiveBack")
+    @ApiOperation(value = "是否归还钥匙房卡", notes = "小程序-钟点房当天占用状态", httpMethod = "GET")
+    CommonResult ifGiveBack(@RequestParam Integer houseOrderId,@RequestParam Integer giveBack);
+
+
 }
 

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

@@ -417,6 +417,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     vo.setPayPrice(houseOrder.getPayPrice());
 //                  密码
                     vo.setPassWord(houseOrder.getKeyPassWord());
+//                   钥匙类型
+                    vo.setLockStatus(houseOrder.getKeyType());
+//                  是否归还
+                    vo.setGiveBack(houseOrder.getGiveBack());
+//                   超时时间
+                    vo.setTimeOut(houseOrder.getTimeOut());
+//                    订单id
+                    vo.setHouseOrderId(houseOrder.getId());
 
 //                    已入住时间
                     LocalDateTime now = LocalDateTime.now();

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

@@ -573,7 +573,7 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public CommonResult pageList(int adminId, 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 CommonResult pageList(int adminId, 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) {
 //        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
 //        if (ObjectUtils.isEmpty(permissionSetting)) {
 //            return CommonResult.fail("非法进入");
@@ -3098,6 +3098,19 @@ public class HouseOrderController implements HouseOrderAPI {
         return CommonResult.ok(openId);
     }
 
+    @Override
+    public CommonResult ifGiveBack(Integer houseOrderId, Integer giveBack) {
+        HouseOrder byId = houseOrderService.getById(houseOrderId);
+        if (ObjectUtils.isEmpty(byId)) {
+            return  CommonResult.fail("订单异常");
+        }
+        byId.setGiveBack(giveBack);
+
+        houseOrderService.updateById(byId);
+
+        return CommonResult.ok();
+    }
+
 
     public static void main(String[] args) throws Exception {
 //        获取签名
@@ -3324,6 +3337,7 @@ public class HouseOrderController implements HouseOrderAPI {
     //    到时间超时还未付款则取消
     @Scheduled(cron = "0 0/5 * * * ? ")
     public void getTimeOut() {
+
 //        当前时间
         LocalDateTime now = LocalDateTime.now();
         LambdaQueryWrapper<HouseOrder> wrapper = new LambdaQueryWrapper<>();

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

@@ -23,7 +23,7 @@ public class HouseOrderPageListVo {
 //  手机号
     private String phone;
 
-    //    房型
+    //    房型名称
     private String houseName;
     //    房间号
     private String houseNumber;
@@ -52,4 +52,15 @@ public class HouseOrderPageListVo {
 
     @ApiModelProperty(value = "房间类型（1:全日房，2：钟点房）")
     private Integer roomType;
+
+    @ApiModelProperty(value = "钥匙类型开锁的方式（1.密码，2.卡片，3.指纹，4.身份证，5.钥匙）")
+    private Integer keyType;
+
+    @ApiModelProperty(value = "开锁密码")
+    private String keyPassWord;
+
+    @ApiModelProperty(value = "是否归还 1:已归还，2：未归还")
+    private Integer giveBack;
+
+
 }

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

@@ -47,6 +47,7 @@ public class ParticularHouseNumberStatusVo {
 //    房间状态 状态 1空闲、2脏房、3预定、4入住、5锁定、6维修
     private int houseStatus;
 
+    @ApiModelProperty(value = "开锁密码")
     private String passWord;
 
     @ApiModelProperty(value = "楼栋")
@@ -54,4 +55,17 @@ public class ParticularHouseNumberStatusVo {
 
     @ApiModelProperty(value = "单元")
     private String element;
+
+    @ApiModelProperty(value = "钥匙类型开锁的方式（1.密码，2.卡片，3.指纹，4.身份证，5.钥匙）")
+    private Integer lockStatus;
+
+
+    @ApiModelProperty(value = "是否归还 1:已归还，2：未归还")
+    private Integer giveBack;
+
+    @ApiModelProperty(value = "超时时间")
+    private String timeOut;
+
+    private Integer houseOrderId;
+
 }