修改删除订单，该顶单下的评论缺少入住时间问题，查看个人优惠券问题

.idea/workspace.xml

@@ -5,140 +5,48 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="42a0d34b-c484-4704-92dd-be5ac61d2f66" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/PermissionSettingAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/ExcelUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/DictionaryCompare.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/EndPay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/JaxbUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/PayWxUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/TongYiReturn.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CancelDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CheckIdCardDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CheckOutDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CleanRoomDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/DirtyRoomDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/EstablishOrderDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/MaintainDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/ReserveDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/RoomChangeDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/LockRoomDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseOrderPageListVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStustaVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/PriceVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ReserveDayVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/AccessToken.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/CodeEntity.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/CodeEntityVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Ordering.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Pay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/PayResult.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Users.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WechatResult.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WechatUnifiedOrder.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Wechat_userinfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WeiXinUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Wx_user.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/AdminAPI.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/AdminMenuAPI.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/UsersAPI.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/UsersMenuAPI.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SaveParentDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SaveSecondaryDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/QueryExportVo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberStateAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberStateAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/HouseOrderAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseOrderAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/HousePriceAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HousePriceAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/MD5.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/MD5.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/config/DoorLockConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/config/DoorLockConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/config/WeixiaoConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/config/WeixiaoConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/PermissionSettingAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/PermissionSettingAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HousePriceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HousePriceController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseStateController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/PasswordIssController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/PasswordIssController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/PermissionSettingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/PermissionSettingController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseLockMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseLockMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseNumberStateMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseNumberStateMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/UsersController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/UsersController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseOrderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseOrderMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HousePriceMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HousePriceMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseStateMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CardInfoDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CardInfoDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/EstablishOrder.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/FingerprintDataDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/FingerprintDataDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/PasswordDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/PasswordDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/PasswordUrlEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/PasswordUrlEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseNumber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseNumber.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseNumberState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseNumberState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseOrder.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseState.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/CalendarPageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/CalendarPageVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseNumberStateDateVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseNumberStateDateVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseNumberStatePageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseNumberStatePageVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStateVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStateVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseLockService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseLockService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberStateService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberStateService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/PermissionSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/PermissionSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Users.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Users.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseOrderPageListVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseOrderPageListVo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseOrderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HousePriceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HousePriceService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseStateService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseLockServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseLockServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseNumberStateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseNumberStateServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseOrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HousePriceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HousePriceServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseStateServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseLockMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseLockMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberStateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberStateMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseOrderMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HousePriceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HousePriceMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseStateMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/AutoCode.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/AutoCode.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HouseNumberStateAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/HouseNumberStateAPI.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HouseOrderAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/HouseOrderAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/MD5.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/MD5.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/DoorLockConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/config/DoorLockConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/WeixiaoConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/config/WeixiaoConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HouseController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HousePriceAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/HousePriceAPI.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseNumberStateController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HouseNumberStateController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HouseOrderController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HousePriceController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HousePriceController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseStateController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/PasswordIssController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/PasswordIssController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseLockMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseLockMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberStateMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberStateMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/PermissionSettingController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/PermissionSettingController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UsersController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/UsersController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseOrderMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseOrderMapper.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HousePriceMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HousePriceMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseStateMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CardInfoDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/CardInfoDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/EstablishOrder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/FingerprintDataDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/FingerprintDataDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/PasswordDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/PasswordDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/PasswordUrlEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/PasswordUrlEnum.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumber.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumber.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumberState.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumberState.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseOrder.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseOrder.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseState.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/CalendarPageVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/CalendarPageVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseNumberStatePageVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseNumberStatePageVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseStateVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseStateVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseLockService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HouseLockService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberStateService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberStateService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CancelDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/CancelDto.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/PermissionSetting.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/PermissionSetting.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Users.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Users.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseOrderPageListVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseOrderPageListVo.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HouseOrderService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HousePriceService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HousePriceService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseStateService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseLockServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseLockServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberStateServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberStateServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseOrderServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HousePriceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HousePriceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseStateServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseLockMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HouseLockMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberStateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberStateMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HouseOrderMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HousePriceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HousePriceMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseStateMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -148,8 +56,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="Interface" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -171,7 +79,7 @@
     <option name="skipTests" value="true" />
   </component>
   <component name="ProblemsViewState">
-    <option name="selectedTabId" value="ProjectErrors" />
+    <option name="selectedTabId" value="CurrentFile" />
   </component>
   <component name="ProjectId" id="2YHd6TDRlyqYh3OC9nI7fVxdhno" />
   <component name="ProjectViewState">
@@ -221,7 +129,20 @@
       </set>
     </option>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
+    <configuration name="AutoCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.template.AutoCode" />
+      <module name="iHotel_student_houtai" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.template.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <option name="ACTIVE_PROFILES" />
       <module name="iHotel_student_houtai" />
@@ -236,6 +157,15 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <list>
+      <item itemvalue="Application.AutoCode" />
+      <item itemvalue="Spring Boot.MybatisPlusApplication" />
+    </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.AutoCode" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SshConsoleOptionsProvider">
@@ -250,7 +180,7 @@
       <updated>1700186263832</updated>
       <workItem from="1700186265128" duration="1452000" />
       <workItem from="1700187845025" duration="272442000" />
-      <workItem from="1701824578863" duration="58559000" />
+      <workItem from="1701824578863" duration="84735000" />
     </task>
     <servers />
   </component>
@@ -283,22 +213,22 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>162</line>
+          <line>168</line>
           <option name="timeStamp" value="31" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>412</line>
+          <line>418</line>
           <option name="timeStamp" value="38" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>166</line>
+          <line>172</line>
           <option name="timeStamp" value="41" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>135</line>
+          <line>141</line>
           <option name="timeStamp" value="42" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -313,7 +243,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>825</line>
+          <line>827</line>
           <option name="timeStamp" value="50" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -328,22 +258,22 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>338</line>
+          <line>344</line>
           <option name="timeStamp" value="60" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>610</line>
+          <line>611</line>
           <option name="timeStamp" value="61" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>665</line>
+          <line>666</line>
           <option name="timeStamp" value="62" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>629</line>
+          <line>630</line>
           <option name="timeStamp" value="64" />
         </line-breakpoint>
       </breakpoints>

src/main/java/com/template/AutoCode.java

@@ -56,7 +56,7 @@ public class AutoCode {
         mpg.setPackageInfo(pc);
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("unlocking"); // 设置要映射的表名
+        strategy.setInclude("users_menu"); // 设置要映射的表名
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setEntityLombokModel(true); // 自动lombok；

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

@@ -0,0 +1,7 @@
+package com.template.api;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/auto/admin")
+public interface AdminAPI {
+}

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

@@ -0,0 +1,23 @@
+package com.template.api;
+
+import com.template.model.dto.SaveParentDto;
+import com.template.model.dto.SaveSecondaryDto;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/auto/admin-menu")
+public interface AdminMenuAPI {
+
+    @PostMapping("/saveParent")
+    @ApiOperation(value = "添加一级用户", notes = "添加一级用户", httpMethod = "POST")
+    CommonResult saveParent(@RequestBody SaveParentDto saveParentDto);
+
+    @PostMapping("/saveSecondary")
+    @ApiOperation(value = "添加次级用户", notes = "添加次级用户", httpMethod = "POST")
+    CommonResult saveSecondary(@RequestBody SaveSecondaryDto saveSecondaryDto);
+
+
+}

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);
 
     @PostMapping("/cancel")
     @ApiOperation(value = "订单管理-订单取消", notes = "订单管理-订单取消", httpMethod = "POST")
@@ -53,15 +53,15 @@ public interface HouseOrderAPI {
     CommonResult checkOut(@RequestBody CheckOutDto checkOutDto);
 
     @PostMapping("/refund")
-    @ApiOperation(value = "房态管理-退款", notes = "房态管理-退款", httpMethod = "POST")
+    @ApiOperation(value = "订单管理-退款", notes = "订单管理-退款", httpMethod = "POST")
     CommonResult refund();
 
     @PostMapping("/roomChange")
-    @ApiOperation(value = "房态管理-换房", notes = "房态管理-换房", httpMethod = "POST")
+    @ApiOperation(value = "订单管理-换房", notes = "订单管理-换房", httpMethod = "POST")
     CommonResult roomChange(@RequestBody RoomChangeDto roomChangeDto);
 
     @GetMapping("/queryExport")
-    @ApiOperation(value = "订单导出", notes = "订单导出", httpMethod = "GET")
-    void queryExport(HttpServletResponse response,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);
+    @ApiOperation(value = "订单管理-订单导出", notes = "订单管理-订单导出", httpMethod = "GET")
+    CommonResult 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);
 
 }

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

@@ -4,4 +4,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 @RequestMapping("/auto/permission-setting")
 public interface PermissionSettingAPI {
+
+
 }

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

@@ -0,0 +1,12 @@
+package com.template.api;
+
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/auto/users")
+public interface UsersAPI {
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.template.api;
+
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/auto/users-menu")
+public interface UsersMenuAPI {
+
+
+
+
+
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.template.controller;
+
+
+import com.template.api.AdminAPI;
+import com.template.model.pojo.Admin;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@RestController
+public class AdminController implements AdminAPI {
+
+}
+

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

@@ -0,0 +1,114 @@
+package com.template.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.template.api.AdminMenuAPI;
+import com.template.model.dto.SaveParentDto;
+import com.template.model.dto.SaveSecondaryDto;
+import com.template.model.pojo.AdminMenu;
+import com.template.model.pojo.PermissionSetting;
+import com.template.model.result.CommonResult;
+import com.template.services.AdminMenuService;
+import com.template.services.PermissionSettingService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@RestController
+public class AdminMenuController implements AdminMenuAPI {
+
+    @Autowired
+    AdminMenuService adminMenuService;
+
+    @Autowired
+    PermissionSettingService permissionSettingService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public CommonResult saveParent(SaveParentDto saveParentDto) {
+
+        if (ObjectUtils.isEmpty(saveParentDto)) {
+            return CommonResult.fail();
+        }
+
+        String name = saveParentDto.getName();
+
+        LambdaQueryWrapper<AdminMenu> wrapperAm = new LambdaQueryWrapper<>();
+        wrapperAm.eq(AdminMenu::getName, name);
+        AdminMenu one = adminMenuService.getOne(wrapperAm);
+        if (ObjectUtils.isNotEmpty(one)) {
+            return CommonResult.fail("已有该角色");
+        }
+        try {
+
+            AdminMenu adminMenu = new AdminMenu();
+            adminMenu.setParentId(0);
+            adminMenu.setName(name);
+            adminMenuService.save(adminMenu);
+            PermissionSetting permissionSetting = new PermissionSetting();
+            BeanUtils.copyProperties(saveParentDto, permissionSetting);
+            permissionSetting.setAdminMenuId(adminMenu.getId());
+
+            permissionSettingService.save(permissionSetting);
+
+            return CommonResult.ok();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return CommonResult.fail();
+        }
+
+
+    }
+
+    @Override
+    public CommonResult saveSecondary(SaveSecondaryDto saveSecondaryDto) {
+        if (ObjectUtils.isEmpty(saveSecondaryDto)) {
+            return CommonResult.fail();
+        }
+        String name = saveSecondaryDto.getName();
+
+        LambdaQueryWrapper<AdminMenu> wrapperAm = new LambdaQueryWrapper<>();
+        wrapperAm.eq(AdminMenu::getName, name);
+        AdminMenu one = adminMenuService.getOne(wrapperAm);
+        if (ObjectUtils.isNotEmpty(one)) {
+            return CommonResult.fail("已有该角色");
+        }
+        try {
+            AdminMenu adminMenu = new AdminMenu();
+            adminMenu.setParentId(saveSecondaryDto.getParentId());
+            adminMenu.setName(name);
+            adminMenuService.save(adminMenu);
+            PermissionSetting permissionSetting = new PermissionSetting();
+            BeanUtils.copyProperties(saveSecondaryDto, permissionSetting);
+            permissionSetting.setAdminMenuId(adminMenu.getId());
+
+            permissionSettingService.save(permissionSetting);
+
+            return CommonResult.ok();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return CommonResult.fail();
+        }
+
+    }
+
+
+
+
+}
+

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

@@ -550,6 +550,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 users1.setUserName(name);
                 users1.setPhone(phone);
                 users1.setCardNumber(cardNumber);
+                users1.setUserMenuId("1");
                 boolean save = usersService.save(users1);
                 houseOrder.setLiveUsersId(users1.getId() + "");
             } else {
@@ -699,6 +700,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 users1.setFingerprint(fingerprint);
                 users1.setIdCard(idCard);
                 users1.setIdCardInformation(idCardInformation);
+                users1.setUserMenuId("1");
                 boolean save = usersService.save(users1);
                 houseOrder.setLiveUsersId(users1.getId() + "");
             } else {

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

@@ -8,12 +8,18 @@ import com.template.api.HouseOrderAPI;
 import com.template.common.utils.*;
 import com.template.component.WeiXiaoComponent;
 import com.template.model.dto.*;
+import com.template.model.vo.AlterPriceRecordVo;
 import com.template.model.vo.HouseOrderPageListVo;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.PriceVo;
+import com.template.model.vo.QueryExportVo;
 import com.template.services.*;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -433,7 +439,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) {
         PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -538,7 +544,7 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public CommonResult particulars(String orderNumber,int adminId) {
+    public CommonResult particulars(String orderNumber, int adminId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -656,6 +662,7 @@ public class HouseOrderController implements HouseOrderAPI {
                 users1.setFingerprint(fingerprint);
                 users1.setIdCard(idCard);
                 users1.setIdCardInformation(idCardInformation);
+                users1.setUserMenuId("1");
                 boolean save = usersService.save(users1);
                 houseOrder.setLiveUsersId(users1.getId() + "");
             } else {
@@ -801,7 +808,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
 //            boolean effectiveDate = DateUtil.isEffectiveDate(new Date(), liveTime, endTime);
 //            if (!effectiveDate) {
-            HouseNumberState houseNumberStateData=houseNumberStateService.getData(new Date(),houseNumberId);
+            HouseNumberState houseNumberStateData = houseNumberStateService.getData(new Date(), houseNumberId);
             if (ObjectUtils.isNotEmpty(houseNumberStateData)) {
                 houseOrder.setLeaveTime(Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter).atZone(ZoneId.systemDefault()).toInstant()));
                 houseOrderService.updateById(houseOrder);
@@ -818,7 +825,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
 //        修改房态
 
-            LambdaQueryWrapper<HouseNumberState> wrapperHns=new LambdaQueryWrapper<>();
+            LambdaQueryWrapper<HouseNumberState> wrapperHns = new LambdaQueryWrapper<>();
             wrapperHns.eq(HouseNumberState::getOrderNumber, orderNumber);
             wrapperHns.eq(HouseNumberState::getHouseNumberId, houseNumberId);
             HouseNumberState houseNumberState = houseNumberStateService.getOne(wrapperHns);
@@ -835,7 +842,6 @@ public class HouseOrderController implements HouseOrderAPI {
             houseNumber.setHouseStatus(2);
 
 
-
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
             houseNumberService.updateById(houseNumber);
@@ -1020,8 +1026,107 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public void queryExport(HttpServletResponse response, 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 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) {
+        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
+        if (ObjectUtils.isEmpty(permissionSetting)) {
+            return CommonResult.fail("非法进入");
+        }
+//      判断该用户是否拥有权限
+        String houseTypeManagement = permissionSetting.getHouseOrderManagement();
+        if (!"0".equals(houseTypeManagement) && !"9".equals(houseTypeManagement)) {
+            return CommonResult.fail("此账号暂无该权限");
+        }
 
+        List<QueryExportVo> vos = houseOrderService.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime);
+
+        //        导出
+        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("取消时间");
+
+        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());
+                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);
+                //                订单 订单状态 1.待支付，2.已支付，3.待入住，4.已入住，5.待结账，6.退款中，7.已退款，8.已退房，9.已取消，超时
+                String orderStart = vo.getOrderStart();
+                String orderName = "";
+                if ("1".equals(orderStart)) {
+                    orderName = "待支付";
+                } else if ("2".equals(orderStart)) {
+                    orderName = "已支付";
+                } else if ("3".equals(orderStart)) {
+                    orderName = "待入住";
+                } else if ("4".equals(orderStart)) {
+                    orderName = "已入住";
+                } else if ("5".equals(orderStart)) {
+                    orderName = "待结账";
+                } else if ("6".equals(orderStart)) {
+                    orderName = "退款中";
+                } else if ("7".equals(orderStart)) {
+                    orderName = "已退款";
+                } else if ("8".equals(orderStart)) {
+                    orderName = "已退房";
+                } 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());
+            }
+        }
+        // 将工作簿写入文件
+        ExcelUtils.excelDownload(workbook, "订单表.xlsx", response);
+
+        return CommonResult.ok();
     }
 
 
@@ -1040,20 +1145,23 @@ public class HouseOrderController implements HouseOrderAPI {
         try {
             ArrayList<HouseOrder> houseOrders = new ArrayList<>();
             ArrayList<HouseNumber> houseNumbers = new ArrayList<>();
-            for (HouseOrder houseOrder : list) {
-                houseOrder.setOrderStatus("8");
-                houseOrder.setLeaveTime(new Date());
-                String houseNumberId = houseOrder.getHouseNumberId();
+            if (ObjectUtils.isNotEmpty(list)&&list.size()>0) {
+                for (HouseOrder houseOrder : list) {
+                    houseOrder.setOrderStatus("8");
+                    houseOrder.setLeaveTime(new Date());
+                    String houseNumberId = houseOrder.getHouseNumberId();
 //            todo 获取水电止码
-                HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+                    HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //          将房间设置成脏房
-                houseNumber.setHouseStatus(2);
+                    houseNumber.setHouseStatus(2);
 
-                houseOrders.add(houseOrder);
-                houseNumbers.add(houseNumber);
+                    houseOrders.add(houseOrder);
+                    houseNumbers.add(houseNumber);
+                }
+                houseOrderService.updateBatchById(houseOrders);
+                houseNumberService.updateBatchById(houseNumbers);
             }
-            houseOrderService.updateBatchById(houseOrders);
-            houseNumberService.updateBatchById(houseNumbers);
+
 
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -303,7 +303,7 @@ public class HousePriceController implements HousePriceAPI {
         List<AlterPriceRecordVo> vos = housePriceService.queryExport(type, houseName, operatingTime, priceTime, operatingName);
         //        导出
         Workbook workbook = new XSSFWorkbook();
-        Sheet sheet = workbook.createSheet("支付成功记录表");
+        Sheet sheet = workbook.createSheet("改价记录表");
         Row headerRow = sheet.createRow(0);
         headerRow.createCell(0).setCellValue("类型");
         headerRow.createCell(1).setCellValue("房型名称");
@@ -320,8 +320,8 @@ public class HousePriceController implements HousePriceAPI {
                 dataRow1.createCell(0).setCellValue(vo.getHouseType());
                 dataRow1.createCell(1).setCellValue(vo.getHouseName());
                 dataRow1.createCell(2).setCellValue(vo.getSetDate());
-                dataRow1.createCell(3).setCellValue(vo.getAlterPrice().doubleValue());
-                dataRow1.createCell(4).setCellValue(vo.getOriginalPrice().doubleValue());
+                dataRow1.createCell(3).setCellValue(vo.getAlterPrice().toString());
+                dataRow1.createCell(4).setCellValue(vo.getOriginalPrice().toString());
                 dataRow1.createCell(5).setCellValue(vo.getName());
                 dataRow1.createCell(6).setCellValue(vo.getDate());
             }

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

@@ -1,6 +1,8 @@
 package com.template.controller;
 
 
+import com.template.api.UsersAPI;
+import com.template.model.result.CommonResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -14,8 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-11-27
  */
 @RestController
-@RequestMapping("/auto/users")
-public class UsersController {
+public class UsersController implements UsersAPI {
+
 
 }
 

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

@@ -0,0 +1,21 @@
+package com.template.controller;
+
+
+import com.template.api.UsersMenuAPI;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@RestController
+public class UsersMenuController implements UsersMenuAPI {
+
+}
+

src/main/java/com/template/mapper/AdminMapper.java

@@ -0,0 +1,18 @@
+package com.template.mapper;
+
+import com.template.model.pojo.Admin;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@Mapper
+public interface AdminMapper extends BaseMapper<Admin> {
+
+}

src/main/java/com/template/mapper/AdminMenuMapper.java

@@ -0,0 +1,18 @@
+package com.template.mapper;
+
+import com.template.model.pojo.AdminMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@Mapper
+public interface AdminMenuMapper extends BaseMapper<AdminMenu> {
+
+}

src/main/java/com/template/mapper/UsersMenuMapper.java

@@ -0,0 +1,18 @@
+package com.template.mapper;
+
+import com.template.model.pojo.UsersMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@Mapper
+public interface UsersMenuMapper extends BaseMapper<UsersMenu> {
+
+}

src/main/java/com/template/model/dto/SaveParentDto.java

@@ -0,0 +1,48 @@
+package com.template.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SaveParentDto {
+//    一级权限的名字
+    private String name;
+
+    @ApiModelProperty(value = "房态管理 0.全部 1.预定，2退房，3.维修，4.关房，5.置脏，6.置净，7.退款，8.入住，9.锁房，10.日志，11.换房，12.开房，13.门锁管理")
+    private String houseStatusManagement;
+
+    @ApiModelProperty(value = "房型管理 0.全部 1.添加，2.修改，3.删除，4.批量改价，5.改价记录")
+    private String houseTypeManagement;
+
+    @ApiModelProperty(value = "订单管理 0.全部 1.取消，2.详情，3.入住，4.退款，5.退房，6.查询，7.删除，8.换房，9.导出")
+    private String houseOrderManagement;
+
+    @ApiModelProperty(value = "值班管理 0.全部 1.导入值班，2.导出")
+    private String dutyManagement;
+
+    @ApiModelProperty(value = "流程管理 0.全部 1.添加流程，2.修改流程，3.同意，4.驳回，5.查询，6.规则设置，7.导出")
+    private String processManagement;
+
+    @ApiModelProperty(value = "报表管理 0.全部 1.查询，2.导出")
+    private String reportManagement;
+
+    @ApiModelProperty(value = "门锁管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入，7.批量重置密码，8.重置密码，9.添加总卡，10.禁用门锁，11.钥匙管理，12.消息列表，13.远程开锁，14.解绑设备")
+    private String doorLockManagement;
+
+    @ApiModelProperty(value = "水电管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入")
+    private String hydropowerManagement;
+
+    @ApiModelProperty(value = "用户管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入")
+    private String userManagement;
+
+    @ApiModelProperty(value = "角色管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入")
+    private String roleManagement;
+
+    @ApiModelProperty(value = "账号管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入")
+    private String accountManagement;
+
+    @ApiModelProperty(value = "系统管理 0.全部 1.退房设置，2.公寓设置，3.补助设置，4.催缴设置")
+    private String systemManagement;
+
+
+}

src/main/java/com/template/model/dto/SaveSecondaryDto.java

@@ -0,0 +1,48 @@
+package com.template.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SaveSecondaryDto {
+    private String name;
+//    上级的id
+    private int parentId;
+
+    @ApiModelProperty(value = "房态管理 0.全部 1.预定，2退房，3.维修，4.关房，5.置脏，6.置净，7.退款，8.入住，9.锁房，10.日志，11.换房，12.开房，13.门锁管理")
+    private String houseStatusManagement;
+
+    @ApiModelProperty(value = "房型管理 0.全部 1.添加，2.修改，3.删除，4.批量改价，5.改价记录")
+    private String houseTypeManagement;
+
+    @ApiModelProperty(value = "订单管理 0.全部 1.取消，2.详情，3.入住，4.退款，5.退房，6.查询，7.删除，8.换房，9.导出")
+    private String houseOrderManagement;
+
+    @ApiModelProperty(value = "值班管理 0.全部 1.导入值班，2.导出")
+    private String dutyManagement;
+
+    @ApiModelProperty(value = "流程管理 0.全部 1.添加流程，2.修改流程，3.同意，4.驳回，5.查询，6.规则设置，7.导出")
+    private String processManagement;
+
+    @ApiModelProperty(value = "报表管理 0.全部 1.查询，2.导出")
+    private String reportManagement;
+
+    @ApiModelProperty(value = "门锁管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入，7.批量重置密码，8.重置密码，9.添加总卡，10.禁用门锁，11.钥匙管理，12.消息列表，13.远程开锁，14.解绑设备")
+    private String doorLockManagement;
+
+    @ApiModelProperty(value = "水电管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入")
+    private String hydropowerManagement;
+
+    @ApiModelProperty(value = "用户管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入")
+    private String userManagement;
+
+    @ApiModelProperty(value = "角色管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入")
+    private String roleManagement;
+
+    @ApiModelProperty(value = "账号管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入")
+    private String accountManagement;
+
+    @ApiModelProperty(value = "系统管理 0.全部 1.退房设置，2.公寓设置，3.补助设置，4.催缴设置")
+    private String systemManagement;
+
+}

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

@@ -0,0 +1,77 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="Admin对象", description="")
+public class Admin implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "管理端用户表")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "管理菜单表的id")
+    private String adminMenuId;
+
+    @ApiModelProperty(value = "账号")
+    private String userNumber;
+
+    @ApiModelProperty(value = "密码")
+    private String passWord;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    private String phoneNumber;
+
+    @ApiModelProperty(value = "部门")
+    private String department;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

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

@@ -0,0 +1,64 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="AdminMenu对象", description="")
+public class AdminMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "父级ID(parentid为0的是第一级)")
+    private Integer parentId;
+
+    @ApiModelProperty(value = "类型名称")
+    private String name;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

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

@@ -35,7 +35,7 @@ public class PermissionSetting implements Serializable {
     private Integer id;
 
     @ApiModelProperty(value = "管理员id")
-    private Integer adminId;
+    private Integer adminMenuId;
 
     @ApiModelProperty(value = "房态管理 0.全部 1.预定，2退房，3.维修，4.关房，5.置脏，6.置净，7.退款，8.入住，9.锁房，10.日志，11.换房，12.开房，13.门锁管理")
     private String houseStatusManagement;

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

@@ -40,8 +40,8 @@ public class Users implements Serializable {
     @ApiModelProperty(value = "用户名")
     private String userName;
 
-    @ApiModelProperty(value = "用户角色")
-    private String userRole;
+    @ApiModelProperty(value = "用户角色id")
+    private String userMenuId;
 
     @ApiModelProperty(value = "微校卡号")
     private String wxCard;

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

@@ -0,0 +1,64 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="UsersMenu对象", description="")
+public class UsersMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.UUID)
+    private Integer id;
+
+    @ApiModelProperty(value = "父级ID(parentid为0的是第一级)")
+    private Integer parentId;
+
+    @ApiModelProperty(value = "类型名称")
+    private String name;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

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

@@ -29,6 +29,8 @@ public class HouseOrderPageListVo {
     private BigDecimal orderPrice;
     //    支付渠道
     private String payType;
+    //    订单渠道
+    private String orderChannelType;
     //     订单状态
     private String orderStart;
     //    支付时间

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

@@ -0,0 +1,40 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class QueryExportVo {
+    //    订单号
+    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 orderChannelType;
+    //     订单状态
+    private String orderStart;
+    //    支付时间
+    private String payTime;
+    //    退款时间
+    private Date refundTime;
+    //    取消时间
+    private Date cancelTime;
+}

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

@@ -0,0 +1,16 @@
+package com.template.services;
+
+import com.template.model.pojo.AdminMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+public interface AdminMenuService extends IService<AdminMenu> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.template.services;
+
+import com.template.model.pojo.Admin;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+public interface AdminService extends IService<Admin> {
+
+}

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

@@ -5,8 +5,10 @@ import com.template.model.vo.HouseOrderPageListVo;
 import com.template.model.pojo.HouseOrder;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.PriceVo;
+import com.template.model.vo.QueryExportVo;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -40,4 +42,7 @@ public interface HouseOrderService extends IService<HouseOrder> {
 
     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);
 
+    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);
+
+
 }

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

@@ -0,0 +1,16 @@
+package com.template.services;
+
+import com.template.model.pojo.UsersMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+public interface UsersMenuService extends IService<UsersMenu> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.template.services.impl;
+
+import com.template.model.pojo.AdminMenu;
+import com.template.mapper.AdminMenuMapper;
+import com.template.services.AdminMenuService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@Service
+public class AdminMenuServiceImpl extends ServiceImpl<AdminMenuMapper, AdminMenu> implements AdminMenuService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.template.services.impl;
+
+import com.template.model.pojo.Admin;
+import com.template.mapper.AdminMapper;
+import com.template.services.AdminService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@Service
+public class AdminServiceImpl extends ServiceImpl<AdminMapper, Admin> implements AdminService {
+
+}

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

@@ -10,6 +10,7 @@ import com.template.model.vo.HouseOrderPageListVo;
 import com.template.model.pojo.*;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.PriceVo;
+import com.template.model.vo.QueryExportVo;
 import com.template.services.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -296,4 +297,10 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
         IPage<HouseOrderPageListVo> result=houseOrderMapper.pageList(pageVo,keyWord,houseType,orderStatus,payPriceStartTime,payPriceEndTime,refundStartTime,refundEndTime,cancelStartTime,cancelEndTime,liveStartTime,liveEndTime,leaveStartTime,leaveEndTime);
         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);
+
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.template.services.impl;
+
+import com.template.model.pojo.UsersMenu;
+import com.template.mapper.UsersMenuMapper;
+import com.template.services.UsersMenuService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-13
+ */
+@Service
+public class UsersMenuServiceImpl extends ServiceImpl<UsersMenuMapper, UsersMenu> implements UsersMenuService {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.AdminMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.AdminMenuMapper">
+
+</mapper>

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

@@ -14,6 +14,7 @@
         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.pay_time as payTime,
         ho.refund_time as refundTime,
@@ -71,4 +72,71 @@
         ho.create_time DESC
 
     </select>
+    <select id="queryExport" resultType="com.template.model.vo.QueryExportVo">
+        SELECT
+        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.pay_time as payTime,
+        ho.refund_time as refundTime,
+        ho.cancel_time as cancelTime
+        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
+        <where>
+            ho.deleted=0
+            <if test="orderStatus != null and orderStatus != ''">
+                AND ho.order_status = #{orderStatus}
+            </if>
+
+            <if test="houseType != null and houseType != ''">
+                AND h.room_type = #{houseType}
+            </if>
+
+            <if test="keyWord != null and keyWord != ''">
+                AND (ho.reserve_name LIKE '%' #{keyWord} '%' or ho.live_name LIKE '%' #{keyWord} '%' )
+            </if>
+
+            <if test="payPriceStartTime != null and payPriceStartTime != '' and payPriceEndTime != null and payPriceEndTime != ''  ">
+                AND #{payPriceEndTime} >= ho.pay_time
+                AND ho.pay_time >= #{payPriceStartTime}
+            </if>
+
+            <if test="refundStartTime != null and refundStartTime != '' and refundEndTime != null and refundEndTime != ''  ">
+                AND ho.refund_time >= #{refundStartTime}
+                AND #{refundEndTime} >= ho.refund_time
+            </if>
+
+            <if test="cancelStartTime != null and cancelStartTime != '' and cancelEndTime != null and cancelEndTime != ''  ">
+                AND ho.cancel_time >= #{cancelStartTime}
+                AND #{cancelEndTime} >= ho.cancel_time
+            </if>
+
+            <if test="liveStartTime != null and liveStartTime != '' and liveEndTime != null and liveEndTime != ''  ">
+                AND #{liveEndTime} >= ho.live_time
+                AND ho.live_time >= #{liveStartTime}
+            </if>
+
+            <if test="leaveStartTime != null and leaveStartTime != '' and leaveEndTime != null and leaveEndTime != ''  ">
+                AND #{leaveEndTime} >= ho.leave_time
+                AND ho.leave_time >= #{leaveStartTime}
+            </if>
+
+        </where>
+        ORDER BY
+        ho.create_time DESC
+    </select>
+
 </mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.UsersMenuMapper">
+
+</mapper>

target/classes/mapper/template/AdminMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.AdminMapper">
+
+</mapper>

target/classes/mapper/template/AdminMenuMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.AdminMenuMapper">
+
+</mapper>

target/classes/mapper/template/HouseOrderMapper.xml

@@ -14,6 +14,7 @@
         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.pay_time as payTime,
         ho.refund_time as refundTime,
@@ -71,4 +72,71 @@
         ho.create_time DESC
 
     </select>
+    <select id="queryExport" resultType="com.template.model.vo.QueryExportVo">
+        SELECT
+        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.pay_time as payTime,
+        ho.refund_time as refundTime,
+        ho.cancel_time as cancelTime
+        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
+        <where>
+            ho.deleted=0
+            <if test="orderStatus != null and orderStatus != ''">
+                AND ho.order_status = #{orderStatus}
+            </if>
+
+            <if test="houseType != null and houseType != ''">
+                AND h.room_type = #{houseType}
+            </if>
+
+            <if test="keyWord != null and keyWord != ''">
+                AND (ho.reserve_name LIKE '%' #{keyWord} '%' or ho.live_name LIKE '%' #{keyWord} '%' )
+            </if>
+
+            <if test="payPriceStartTime != null and payPriceStartTime != '' and payPriceEndTime != null and payPriceEndTime != ''  ">
+                AND #{payPriceEndTime} >= ho.pay_time
+                AND ho.pay_time >= #{payPriceStartTime}
+            </if>
+
+            <if test="refundStartTime != null and refundStartTime != '' and refundEndTime != null and refundEndTime != ''  ">
+                AND ho.refund_time >= #{refundStartTime}
+                AND #{refundEndTime} >= ho.refund_time
+            </if>
+
+            <if test="cancelStartTime != null and cancelStartTime != '' and cancelEndTime != null and cancelEndTime != ''  ">
+                AND ho.cancel_time >= #{cancelStartTime}
+                AND #{cancelEndTime} >= ho.cancel_time
+            </if>
+
+            <if test="liveStartTime != null and liveStartTime != '' and liveEndTime != null and liveEndTime != ''  ">
+                AND #{liveEndTime} >= ho.live_time
+                AND ho.live_time >= #{liveStartTime}
+            </if>
+
+            <if test="leaveStartTime != null and leaveStartTime != '' and leaveEndTime != null and leaveEndTime != ''  ">
+                AND #{leaveEndTime} >= ho.leave_time
+                AND ho.leave_time >= #{leaveStartTime}
+            </if>
+
+        </where>
+        ORDER BY
+        ho.create_time DESC
+    </select>
+
 </mapper>

target/classes/mapper/template/HousePriceMapper.xml

@@ -58,4 +58,51 @@
           and FIND_IN_SET(house_id, #{ids})
           and deleted = 0
     </select>
+
+    <select id="queryExport" resultType="com.template.model.vo.AlterPriceRecordVo">
+        SELECT t2.room_type as houseType,
+        t2.room_name AS houseName,
+        group_concat(REPLACE(t1.set_date, ',', ' 至 ')) AS setDate,
+        t1.price AS alterPrice,
+        t1.original_price AS originalPrice,
+        a.name as `name`,
+        t1.create_time as date
+        FROM house_price t1
+        LEFT JOIN house t2 ON t1.house_id = t2.id
+        and t2.deleted = 0
+        LEFT JOIN admin a on a.id = t1.create_user
+        and a.deleted = 0
+        <where>
+            t1.deleted = 0
+            <if test="type != null and type != ''">
+                AND t2.room_type = #{type}
+            </if>
+
+            <if test="houseName != null and houseName != ''">
+                AND t2.room_name = #{houseName}
+            </if>
+
+            <if test="operatingTime != null and operatingTime != ''">
+                AND t1.create_time BETWEEN SUBSTRING_INDEX(#{operatingTime}, ',', 1) and
+                SUBSTRING_INDEX(#{operatingTime}, ',', -1)
+            </if>
+
+            <if test="priceTime != null and priceTime != ''">
+                AND (substring_index(t1.set_date, ',', 1) BETWEEN SUBSTRING_INDEX(#{priceTime}, ',', 1) and
+                SUBSTRING_INDEX(#{priceTime}, ',', -1)
+                or
+                substring_index(t1.set_date, ',', -1) BETWEEN SUBSTRING_INDEX(#{priceTime}, ',', 1) and
+                SUBSTRING_INDEX(#{priceTime}, ',', -1)
+                )
+            </if>
+
+            <if test="operatingName != null and operatingName != ''">
+                AND a.`name` LIKE '%' #{operatingName} '%'
+            </if>
+
+        </where>
+
+        GROUP BY t1.id
+        ORDER BY t1.create_time DESC
+    </select>
 </mapper>

target/classes/mapper/template/UsersMenuMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.UsersMenuMapper">
+
+</mapper>