更新管理端退房接口

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

@@ -1507,16 +1507,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //            HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
             houseNumber.setHouseStatus(2);
 
-            //            判断该房间是否免费的房间，是则需要支付水电费，并改成带结账状态
-            BigDecimal payPrice = houseOrder.getPayPrice();
-            if (ObjectUtils.isNotEmpty(payPrice) && payPrice.doubleValue() <= 0) {
-                houseOrder.setOrderStatus("5");
-                BigDecimal electricCost = houseOrder.getElectricCost();
-                BigDecimal waterCost = houseOrder.getWaterCost();
-                BigDecimal total = electricCost.add(waterCost);
-                houseOrder.setPayPrice(total);
-            }
-
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);

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

@@ -550,7 +550,13 @@ public class HouseOrderController implements HouseOrderAPI {
             ApartmentSetting apartmentSetting = list2.get(0);
             String phoneNumber = apartmentSetting.getPhoneNumbr();
             String name = apartmentSetting.getName();
-            weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + reserveLeaveTime + ",欢迎您入住" + name + "，我们全体员工很荣幸能为您服务，如有任何需要请致电:" + phoneNumber + "，期待为你服务。祝你生活愉快！", null);
+            String houseId = houseOrder.getHouseId();
+            House byId = houseService.getById(houseId);
+            String roomName="";
+            if (ObjectUtils.isNotEmpty(byId)) {
+                roomName = byId.getRoomName();
+            }
+            weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房型为:"+roomName+",房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + reserveLeaveTime + ",欢迎您入住" + name + "，我们全体员工很荣幸能为您服务，如有任何需要请致电:" + phoneNumber + "，期待为你服务。祝你生活愉快！", null);
 //              添加锁的操作记录
             OperatingRecord operatingRecord = new OperatingRecord();
             operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
@@ -1588,7 +1594,7 @@ public class HouseOrderController implements HouseOrderAPI {
         if ("1".equals(state)) {
             s = "2,3,4,8";
         } else {
-            s = "1,5";
+            s = "5";
         }
 
         PageUtils<ReportStatisticsVo> pageUtils = houseOrderService.reportStatisticsPage(s, keyWord, startTime, endTime, page, size);